From 0f4ae61e7d7baf4f04bc9a1d0ffb429e3ec97837 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sat, 23 Jul 2011 16:59:48 +1200 Subject: Fix a crash in mitmdump event display. --- libmproxy/dump.py | 2 +- 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 -- cgit v1.2.3