diff options
| author | Marcelo Glezer <mg@tekii.com.ar> | 2015-02-05 11:29:53 -0300 |
|---|---|---|
| committer | Marcelo Glezer <mg@tekii.com.ar> | 2015-02-05 11:29:53 -0300 |
| commit | 5cbdd21a4bf2962c855ee5c21470b7d3c733a883 (patch) | |
| tree | 12ffe0ab3e8a6884c6ef226db74531b2de5c7003 /libmproxy/protocol/http.py | |
| parent | 17ee88e07e68e19e24fd0a85b0e1d5723fd19338 (diff) | |
| parent | 310fb18aac972123e0b25e618978d4dce7031078 (diff) | |
| download | mitmproxy-5cbdd21a4bf2962c855ee5c21470b7d3c733a883.tar.gz mitmproxy-5cbdd21a4bf2962c855ee5c21470b7d3c733a883.tar.bz2 mitmproxy-5cbdd21a4bf2962c855ee5c21470b7d3c733a883.zip | |
Merge remote-tracking branch 'base/master'
Diffstat (limited to 'libmproxy/protocol/http.py')
| -rw-r--r-- | libmproxy/protocol/http.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index da7c4240..bebb4f7b 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -996,7 +996,7 @@ class HTTPHandler(ProtocolHandler): include_body=False ) break - except (tcp.NetLibDisconnect, http.HttpErrorConnClosed), v: + except (tcp.NetLibError, http.HttpErrorConnClosed), v: self.c.log( "error in server communication: %s" % repr(v), level="debug" @@ -1043,7 +1043,7 @@ class HTTPHandler(ProtocolHandler): self.c.client_conn.rfile, body_size_limit=self.c.config.body_size_limit ) - except tcp.NetLibDisconnect: + except tcp.NetLibError: # don't throw an error for disconnects that happen # before/between requests. return False @@ -1141,7 +1141,7 @@ class HTTPHandler(ProtocolHandler): message = repr(error) message_debug = None - if isinstance(error, tcp.NetLibDisconnect): + if isinstance(error, tcp.NetLibError): message = None message_debug = "TCP connection closed unexpectedly." elif "tlsv1 alert unknown ca" in message: |