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/protocol/tls.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/protocol/tls.py')
| -rw-r--r-- | libmproxy/protocol/tls.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/protocol/tls.py b/libmproxy/protocol/tls.py index 2935ca9f..cf303ca1 100644 --- a/libmproxy/protocol/tls.py +++ b/libmproxy/protocol/tls.py @@ -7,7 +7,7 @@ from construct import ConstructError import six from netlib.tcp import NetLibError, NetLibInvalidCertificateError -from netlib.http.http1 import HTTP1Protocol +from netlib.http import ALPN_PROTO_HTTP1 from ..contrib.tls._constructs import ClientHello from ..exceptions import ProtocolException, TlsException, ClientHandshakeException from .base import Layer @@ -367,8 +367,8 @@ class TlsLayer(Layer): """ # This gets triggered if we haven't established an upstream connection yet. - default_alpn = HTTP1Protocol.ALPN_PROTO_HTTP1 - # alpn_preference = netlib.http.http2.HTTP2Protocol.ALPN_PROTO_H2 + default_alpn = ALPN_PROTO_HTTP1 + # alpn_preference = ALPN_PROTO_H2 if self.alpn_for_client_connection in options: choice = bytes(self.alpn_for_client_connection) |