diff --git a/libmproxy/dump.py b/libmproxy/dump.py index e3d462eae..23c804528 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 644a80997..8d2888a48 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