aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol/tls.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-26 17:41:14 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-26 17:41:14 +0200
commit1b6ea5caf3ab7c30cc4a822b81ad8288efbae70d (patch)
tree6d295eafd96ee2a39522f1eda3b2ee95e76a1482 /libmproxy/protocol/tls.py
parentb13acd7956f2e09bf5f9001f8f55d018a381f6c2 (diff)
downloadmitmproxy-1b6ea5caf3ab7c30cc4a822b81ad8288efbae70d.tar.gz
mitmproxy-1b6ea5caf3ab7c30cc4a822b81ad8288efbae70d.tar.bz2
mitmproxy-1b6ea5caf3ab7c30cc4a822b81ad8288efbae70d.zip
adjust to netlib response changes + docs
Diffstat (limited to 'libmproxy/protocol/tls.py')
-rw-r--r--libmproxy/protocol/tls.py5
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)