aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-08-25 18:24:17 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-08-25 18:24:17 +0200
commit8ce0de8bed5fbd2c42e7b43ee553e065e1c08a4c (patch)
tree68af983767afd34544388cd133c8d9b148d5b41d /libmproxy
parent56a4bc381efc177c08ed7b9e7c845f74120050e4 (diff)
downloadmitmproxy-8ce0de8bed5fbd2c42e7b43ee553e065e1c08a4c.tar.gz
mitmproxy-8ce0de8bed5fbd2c42e7b43ee553e065e1c08a4c.tar.bz2
mitmproxy-8ce0de8bed5fbd2c42e7b43ee553e065e1c08a4c.zip
minor fixes
Diffstat (limited to 'libmproxy')
-rw-r--r--libmproxy/protocol2/http.py11
-rw-r--r--libmproxy/proxy/server.py2
2 files changed, 9 insertions, 4 deletions
diff --git a/libmproxy/protocol2/http.py b/libmproxy/protocol2/http.py
index 2c8c8d27..5a25c317 100644
--- a/libmproxy/protocol2/http.py
+++ b/libmproxy/protocol2/http.py
@@ -268,10 +268,13 @@ class HttpLayer(Layer):
return
except (HttpErrorConnClosed, NetLibError, HttpError, ProtocolException) as e:
- self.send_to_client(make_error_response(
- getattr(e, "code", 502),
- repr(e)
- ))
+ try:
+ self.send_to_client(make_error_response(
+ getattr(e, "code", 502),
+ repr(e)
+ ))
+ except NetLibError:
+ pass
if isinstance(e, ProtocolException):
raise e
else:
diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py
index 9957caa0..19ddb930 100644
--- a/libmproxy/proxy/server.py
+++ b/libmproxy/proxy/server.py
@@ -100,6 +100,8 @@ class ConnectionHandler2:
print("mitmproxy has crashed!", file=sys.stderr)
print("Please lodge a bug report at: https://github.com/mitmproxy/mitmproxy", file=sys.stderr)
+ self.log("clientdisconnect", "info")
+
def finish(self):
self.client_conn.finish()