diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-07-08 23:49:44 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-07-08 23:49:44 +1200 |
| commit | 097b566e54fa8b2138891fc9d1458bdd42ae7c28 (patch) | |
| tree | b9d5b56f26f77d79c10ae219d68794cc05b730a3 /libmproxy/proxy.py | |
| parent | ceb12438b6f9b637aa56632ff72d6583623531e3 (diff) | |
| download | mitmproxy-097b566e54fa8b2138891fc9d1458bdd42ae7c28.tar.gz mitmproxy-097b566e54fa8b2138891fc9d1458bdd42ae7c28.tar.bz2 mitmproxy-097b566e54fa8b2138891fc9d1458bdd42ae7c28.zip | |
Handle new netlib.tcp.NetLibDisconnect exception.
Diffstat (limited to 'libmproxy/proxy.py')
| -rw-r--r-- | libmproxy/proxy.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index 1a802e8f..bc7051d4 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -199,11 +199,11 @@ class ProxyHandler(tcp.BaseHandler): # disconnect. if http.response_connection_close(response.httpversion, response.headers): return - except (IOError, ProxyError, http.HttpError), e: - if isinstance(e, IOError): - cc.error = str(e) - else: + except (IOError, ProxyError, http.HttpError, tcp.NetLibDisconnect), e: + if hasattr(e, "code"): cc.error = "%s: %s"%(e.code, e.msg) + else: + cc.error = str(e) if request: err = flow.Error(request, cc.error) |