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 | |
| parent | 436a9ea8398e25709f139fde609aa74e8fb3f3f8 (diff) | |
| download | mitmproxy-0af060897854e0e0fc8207af02d22bec9eacab12.tar.gz mitmproxy-0af060897854e0e0fc8207af02d22bec9eacab12.tar.bz2 mitmproxy-0af060897854e0e0fc8207af02d22bec9eacab12.zip | |
adjust to netlib changes
Diffstat (limited to 'libmproxy/proxy')
| -rw-r--r-- | libmproxy/proxy/root_context.py | 7 | ||||
| -rw-r--r-- | libmproxy/proxy/server.py | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/libmproxy/proxy/root_context.py b/libmproxy/proxy/root_context.py index 54bea1db..72243c59 100644 --- a/libmproxy/proxy/root_context.py +++ b/libmproxy/proxy/root_context.py @@ -5,8 +5,7 @@ import sys import six from libmproxy.exceptions import ProtocolException -from netlib.http.http1 import HTTP1Protocol -from netlib.http.http2 import HTTP2Protocol +from netlib.http import ALPN_PROTO_H2, ALPN_PROTO_HTTP1 from netlib.tcp import NetLibError from ..protocol import ( RawTCPLayer, TlsLayer, Http1Layer, Http2Layer, is_tls_record_magic, ServerConnectionMixin @@ -85,9 +84,9 @@ class RootContext(object): # 5. Check for TLS ALPN (HTTP1/HTTP2) if isinstance(top_layer, TlsLayer): alpn = top_layer.client_conn.get_alpn_proto_negotiated() - if alpn == HTTP2Protocol.ALPN_PROTO_H2: + if alpn == ALPN_PROTO_H2: return Http2Layer(top_layer, 'transparent') - if alpn == HTTP1Protocol.ALPN_PROTO_HTTP1: + if alpn == ALPN_PROTO_HTTP1: return Http1Layer(top_layer, 'transparent') # 6. Check for raw tcp mode 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: |