Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mitmproxy_issue_341

Browse Source 
Conflicts:
	netlib/tcp.py
This commit is contained in:
Aldo Cortesi 2014-09-07 12:39:59 +12:00
commit f98989b075
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netlib/tcp.py
View File

@ -494,10 +494,13 @@ class TCPServer(object):
# none.
if traceback:
exc = traceback.format_exc()
print('-' * 40, file=fp)
print("Error in processing of request from %s:%s" % (client_address.host, client_address.port), file=fp)
print('-'*40, file=fp)
print(
"Error in processing of request from %s:%s" % (
client_address.host, client_address.port
), file=fp)
print(exc, file=fp)
print('-' * 40, file=fp)
print('-'*40, file=fp)
def handle_client_connection(self, conn, client_address): # pragma: no cover
"""