Fix a crash in mitmdump event display.

This commit is contained in:
Aldo Cortesi 2011-07-23 16:59:48 +12:00
parent 6cd32bf96f
commit 0f4ae61e7d
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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