diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-17 02:13:28 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-17 02:13:28 +0200 |
| commit | 14a5f405fdf3973f05ca11182e927d145d10d8d6 (patch) | |
| tree | 2843010882d64d928c0f53edffa9f8d48cee6da0 /libmproxy/proxy/server.py | |
| parent | 8fbed971ae4a84e875f1072805b17cc7ada39fad (diff) | |
| download | mitmproxy-14a5f405fdf3973f05ca11182e927d145d10d8d6.tar.gz mitmproxy-14a5f405fdf3973f05ca11182e927d145d10d8d6.tar.bz2 mitmproxy-14a5f405fdf3973f05ca11182e927d145d10d8d6.zip | |
use new netlib exceptions
Diffstat (limited to 'libmproxy/proxy/server.py')
| -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 8b286458..8531b6dc 100644 --- a/libmproxy/proxy/server.py +++ b/libmproxy/proxy/server.py @@ -6,8 +6,8 @@ import socket import six from netlib import tcp +from netlib.exceptions import TcpException from netlib.http.http1 import assemble_response -from netlib.tcp import NetLibError from ..exceptions import ProtocolException, ServerException, ClientHandshakeException from ..protocol import Kill from ..models import ClientConnection, make_error_response @@ -139,7 +139,7 @@ class ConnectionHandler(object): try: error_response = make_error_response(502, repr(e)) self.client_conn.send(assemble_response(error_response)) - except NetLibError: + except TcpException: pass except Exception: self.log(traceback.format_exc(), "error") |