diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-02-21 10:53:16 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-02-21 10:53:16 +1300 |
| commit | cf3182a6d46f64fe0b34a0ec6b01d0aaa886e029 (patch) | |
| tree | ff3de7601c1ae1abe0ff91417be89cba7a30f595 | |
| parent | 54416830371ae197dae87e6634cffede1c03d291 (diff) | |
| parent | cf570200383fc4549a81e712a3b2b67870486d16 (diff) | |
| download | mitmproxy-cf3182a6d46f64fe0b34a0ec6b01d0aaa886e029.tar.gz mitmproxy-cf3182a6d46f64fe0b34a0ec6b01d0aaa886e029.tar.bz2 mitmproxy-cf3182a6d46f64fe0b34a0ec6b01d0aaa886e029.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
| -rw-r--r-- | mitmproxy/dump.py | 2 | ||||
| -rw-r--r-- | mitmproxy/protocol/base.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mitmproxy/dump.py b/mitmproxy/dump.py index d7f076cf..7b4609b4 100644 --- a/mitmproxy/dump.py +++ b/mitmproxy/dump.py @@ -73,7 +73,7 @@ class DumpMaster(flow.FlowMaster): self.set_stream_large_bodies(options.stream_large_bodies) - if self.server.config.http2 and not tcp.HAS_ALPN: # pragma: no cover + if self.server and self.server.config.http2 and not tcp.HAS_ALPN: # pragma: no cover print("ALPN support missing (OpenSSL 1.0.2+ required)!\n" "HTTP/2 is disabled. Use --no-http2 to silence this warning.", file=sys.stderr) diff --git a/mitmproxy/protocol/base.py b/mitmproxy/protocol/base.py index a14066cd..41d47281 100644 --- a/mitmproxy/protocol/base.py +++ b/mitmproxy/protocol/base.py @@ -163,7 +163,7 @@ class ServerConnectionMixin(object): self.server_conn.finish() self.server_conn.close() self.channel.tell("serverdisconnect", self.server_conn) - self.server_conn = ServerConnection(address, source_address) + self.server_conn = ServerConnection(address, (source_address.host, 0)) def connect(self): """ |