diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-09-16 18:45:22 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-16 18:45:22 +0200 |
commit | 0af060897854e0e0fc8207af02d22bec9eacab12 (patch) | |
tree | 8f5206386bb481a813f1b6891c30d5d2d33924ba /libmproxy/proxy/server.py | |
parent | 436a9ea8398e25709f139fde609aa74e8fb3f3f8 (diff) | |
download | mitmproxy-0af060897854e0e0fc8207af02d22bec9eacab12.tar.gz mitmproxy-0af060897854e0e0fc8207af02d22bec9eacab12.tar.bz2 mitmproxy-0af060897854e0e0fc8207af02d22bec9eacab12.zip |
adjust to netlib changes
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 88448172..8b286458 100644 --- a/libmproxy/proxy/server.py +++ b/libmproxy/proxy/server.py @@ -6,7 +6,7 @@ import socket import six from netlib import tcp -from netlib.http.http1 import HTTP1Protocol +from netlib.http.http1 import assemble_response from netlib.tcp import NetLibError from ..exceptions import ProtocolException, ServerException, ClientHandshakeException from ..protocol import Kill @@ -138,7 +138,7 @@ class ConnectionHandler(object): # understandable by HTTP clients and humans. try: error_response = make_error_response(502, repr(e)) - self.client_conn.send(HTTP1Protocol().assemble(error_response)) + self.client_conn.send(assemble_response(error_response)) except NetLibError: pass except Exception: |