diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-09-30 11:02:08 +1000 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-09-30 11:02:08 +1000 |
| commit | 6d1f036021cde61e42891091546a29612d7d9a45 (patch) | |
| tree | d8d36a889b9da3e8b970aa98eecd202e2cf98b82 | |
| parent | 825b0917bd7a7b68ff5ead4a6effd1e4b499756b (diff) | |
| parent | d068000f16cb44b7277de04ba20bd1fc62e4a956 (diff) | |
| download | mitmproxy-6d1f036021cde61e42891091546a29612d7d9a45.tar.gz mitmproxy-6d1f036021cde61e42891091546a29612d7d9a45.tar.bz2 mitmproxy-6d1f036021cde61e42891091546a29612d7d9a45.zip | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | docs/certinstall.rst | 2 | ||||
| -rw-r--r-- | mitmproxy/protocol/http.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/docs/certinstall.rst b/docs/certinstall.rst index f5b92aeb..68ad59cc 100644 --- a/docs/certinstall.rst +++ b/docs/certinstall.rst @@ -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 diff --git a/mitmproxy/protocol/http.py b/mitmproxy/protocol/http.py index e1487943..d3e3c80f 100644 --- a/mitmproxy/protocol/http.py +++ b/mitmproxy/protocol/http.py @@ -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: |