Magic-Mirror/mitmproxy
1
0
Fork 0
mirror of https://github.com/mitmproxy/mitmproxy.git synced 2024-11-23 13:19:48 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Aldo Cortesi 2016-09-30 11:02:08 +10:00
commit 6d1f036021
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/certinstall.rst
View File

@ -135,7 +135,7 @@ mitmproxy. Mitmproxy then uses the provided certificate for interception of the
specified domains instead of generating a certificate signed by its own CA.
The certificate file is expected to be in the PEM format. You can include
intermediary certificates right below your leaf certificate, so that you PEM
intermediary certificates right below your leaf certificate, so that your PEM
file roughly looks like this:
.. code-block:: none

7
mitmproxy/protocol/http.py
View File

@ -185,8 +185,11 @@ class HttpLayer(base.Layer):
return
# update host header in reverse proxy mode
if self.mode == "reverse":
flow.request.headers["Host"] = self.config.upstream_server.address.host
if self.config.options.mode == "reverse":
if six.PY2:
flow.request.headers["Host"] = self.config.upstream_server.address.host.encode()
else:
flow.request.headers["Host"] = self.config.upstream_server.address.host
# set upstream auth
if self.mode == "upstream" and self.config.upstream_auth is not None: