diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-28 13:54:53 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-28 13:54:53 +0200 |
| commit | c11ab3676dee2a490994665e867bcfcb26945777 (patch) | |
| tree | f898c23973b10079fa4479238d5f8f5a8e61d46e /libmproxy/protocol/tls.py | |
| parent | 6661770d4eee3eab3305793613586f3684c24ae9 (diff) | |
| parent | 6075957a9730c6ca5c4c7361bd774345f83d6f59 (diff) | |
| download | mitmproxy-c11ab3676dee2a490994665e867bcfcb26945777.tar.gz mitmproxy-c11ab3676dee2a490994665e867bcfcb26945777.tar.bz2 mitmproxy-c11ab3676dee2a490994665e867bcfcb26945777.zip | |
Merge branch 'http-models'
Diffstat (limited to 'libmproxy/protocol/tls.py')
| -rw-r--r-- | libmproxy/protocol/tls.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libmproxy/protocol/tls.py b/libmproxy/protocol/tls.py index d144e081..9764fb22 100644 --- a/libmproxy/protocol/tls.py +++ b/libmproxy/protocol/tls.py @@ -7,7 +7,6 @@ from construct import ConstructError import six from netlib.exceptions import InvalidCertificateException, TcpException, TlsException -from netlib.http import ALPN_PROTO_HTTP1 from ..contrib.tls._constructs import ClientHello from ..exceptions import ProtocolException, TlsProtocolException, ClientHandshakeException from .base import Layer @@ -367,8 +366,8 @@ class TlsLayer(Layer): """ # This gets triggered if we haven't established an upstream connection yet. - default_alpn = ALPN_PROTO_HTTP1 - # alpn_preference = ALPN_PROTO_H2 + default_alpn = b'http/1.1' + # alpn_preference = b'h2' if self.alpn_for_client_connection in options: choice = bytes(self.alpn_for_client_connection) |