diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-07-31 22:29:13 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-07-31 22:29:13 +0200 |
| commit | e9401a2123f416f8dd4c24bb4bbc74f297369133 (patch) | |
| tree | afebf68d1091d487ef64083962992ea7b703a80e /libmproxy/proxy | |
| parent | f5fb1138fdda77ec4a3bb5493479d2f56cdb0851 (diff) | |
| parent | 3e3dbee936bb71e813d50937118eebff4ba23617 (diff) | |
| download | mitmproxy-e9401a2123f416f8dd4c24bb4bbc74f297369133.tar.gz mitmproxy-e9401a2123f416f8dd4c24bb4bbc74f297369133.tar.bz2 mitmproxy-e9401a2123f416f8dd4c24bb4bbc74f297369133.zip | |
Merge branch 'stream'
Conflicts:
libmproxy/protocol/http.py
Diffstat (limited to 'libmproxy/proxy')
| -rw-r--r-- | libmproxy/proxy/server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py index 61369775..50f01bdc 100644 --- a/libmproxy/proxy/server.py +++ b/libmproxy/proxy/server.py @@ -95,14 +95,14 @@ class ConnectionHandler: except (ProxyError, tcp.NetLibError), e: handle_error(self.conntype, self, e) - except Exception, e: + except Exception: import traceback, sys self.log(traceback.format_exc(), "error") print >> sys.stderr, traceback.format_exc() print >> sys.stderr, "mitmproxy has crashed!" print >> sys.stderr, "Please lodge a bug report at: https://github.com/mitmproxy/mitmproxy" - raise e + raise self.del_server_connection() self.log("clientdisconnect", "info") |