aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-09-14 09:40:13 +1200
committerAldo Cortesi <aldo@nullcube.com>2012-09-14 09:40:13 +1200
commit54cee9db7f6a03bca3058a4b4722073bb55896d8 (patch)
treed99ef1ed23ea1a5179f0af70944d9ec63c85a951 /libmproxy
parentb7d89f691999e8b6de63389388467eefaa3b6111 (diff)
downloadmitmproxy-54cee9db7f6a03bca3058a4b4722073bb55896d8.tar.gz
mitmproxy-54cee9db7f6a03bca3058a4b4722073bb55896d8.tar.bz2
mitmproxy-54cee9db7f6a03bca3058a4b4722073bb55896d8.zip
Catch a potential exception on connection finalization.
Diffstat (limited to 'libmproxy')
-rw-r--r--libmproxy/proxy.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py
index a258b941..4c216d11 100644
--- a/libmproxy/proxy.py
+++ b/libmproxy/proxy.py
@@ -418,7 +418,10 @@ class ProxyServer(tcp.TCPServer):
def handle_connection(self, request, client_address):
h = ProxyHandler(self.config, request, client_address, self, self.masterq, self.server_version)
h.handle()
- h.finish()
+ try:
+ h.finish()
+ except tcp.NetLibDisconnect, e:
+ pass
def handle_shutdown(self):
try: