diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-07-23 16:59:48 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-07-23 16:59:48 +1200 |
| commit | 0f4ae61e7d7baf4f04bc9a1d0ffb429e3ec97837 (patch) | |
| tree | 445e78a96cfba0bd5d03a5ac6fe6d6191fff1198 | |
| parent | 6cd32bf96f0ae71ee03dd2178ec69579a6eb52f6 (diff) | |
| download | mitmproxy-0f4ae61e7d7baf4f04bc9a1d0ffb429e3ec97837.tar.gz mitmproxy-0f4ae61e7d7baf4f04bc9a1d0ffb429e3ec97837.tar.bz2 mitmproxy-0f4ae61e7d7baf4f04bc9a1d0ffb429e3ec97837.zip | |
Fix a crash in mitmdump event display.
| -rw-r--r-- | libmproxy/dump.py | 2 | ||||
| -rw-r--r-- | libmproxy/proxy.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/dump.py b/libmproxy/dump.py index e3d462ea..23c80452 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -139,7 +139,7 @@ class DumpMaster(flow.FlowMaster): def handle_clientdisconnect(self, c): if self.eventlog: - print >> self.outfile, "Disconnect from: %s:%s"%c.client_conn.address, + print >> self.outfile, "Disconnect from: %s:%s"%tuple(c.client_conn.address), print >> self.outfile, "(handled %s requests)"%c.client_conn.requestcount if c.client_conn.connection_error: print >> self.outfile, "\terror: %s"%c.client_conn.connection_error diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index 644a8099..8d2888a4 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -701,7 +701,7 @@ class ProxyHandler(SocketServer.StreamRequestHandler): keyfile = self.config.certfile or self.config.cacert, server_side = True, ssl_version = ssl.PROTOCOL_SSLv23, - do_handshake_on_connect = True + do_handshake_on_connect = True, ) if sys.version_info[1] > 6: kwargs["ciphers"] = self.config.ciphers |