aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy/server.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-07-23 00:21:33 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-07-23 00:21:33 +0200
commitd9ac029ec7d18e5c1a483c7141ba86ad185874b0 (patch)
tree72a963000f43ce09f8ce54695f1c17c05abab579 /libmproxy/proxy/server.py
parent4b4a18a2e4d7cf3e8862192b68f5a2295da9acbe (diff)
downloadmitmproxy-d9ac029ec7d18e5c1a483c7141ba86ad185874b0.tar.gz
mitmproxy-d9ac029ec7d18e5c1a483c7141ba86ad185874b0.tar.bz2
mitmproxy-d9ac029ec7d18e5c1a483c7141ba86ad185874b0.zip
always initialize HTTPResponse.stream attribute
Diffstat (limited to 'libmproxy/proxy/server.py')
-rw-r--r--libmproxy/proxy/server.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py
index 741e5f93..734e2798 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")