diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-16 20:24:48 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-16 20:24:48 +0200 |
| commit | 8fbed971ae4a84e875f1072805b17cc7ada39fad (patch) | |
| tree | 09c31384b2b1d22680534af8ff40ae724a13e05b /libmproxy/proxy/server.py | |
| parent | ee6969c1fac20d592e0775bfe074b4bcfcf83461 (diff) | |
| parent | 0af060897854e0e0fc8207af02d22bec9eacab12 (diff) | |
| download | mitmproxy-8fbed971ae4a84e875f1072805b17cc7ada39fad.tar.gz mitmproxy-8fbed971ae4a84e875f1072805b17cc7ada39fad.tar.bz2 mitmproxy-8fbed971ae4a84e875f1072805b17cc7ada39fad.zip | |
Merge pull request #768 from mitmproxy/netlib-http1-refactor
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: |