diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-28 13:53:59 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-28 13:53:59 +0200 |
| commit | 67229fbdf7be2f3bb591a9da77f75c05ed0ab269 (patch) | |
| tree | aa94ff2eacbe2c5d46dbad3f41c9ca2eae849f73 /netlib/http/http2 | |
| parent | 5261bcdf4b0976b8db3295292143282b34f10c51 (diff) | |
| parent | 23d13e4c1282bc46c54222479c3b83032dad3335 (diff) | |
| download | mitmproxy-67229fbdf7be2f3bb591a9da77f75c05ed0ab269.tar.gz mitmproxy-67229fbdf7be2f3bb591a9da77f75c05ed0ab269.tar.bz2 mitmproxy-67229fbdf7be2f3bb591a9da77f75c05ed0ab269.zip | |
Merge branch 'http-models'
Diffstat (limited to 'netlib/http/http2')
| -rw-r--r-- | netlib/http/http2/connections.py | 4 | ||||
| -rw-r--r-- | netlib/http/http2/frame.py | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/netlib/http/http2/connections.py b/netlib/http/http2/connections.py index 5220d5d2..c493abe6 100644 --- a/netlib/http/http2/connections.py +++ b/netlib/http/http2/connections.py @@ -4,7 +4,7 @@ import time from hpack.hpack import Encoder, Decoder from ... import utils -from .. import Headers, Response, Request, ALPN_PROTO_H2 +from .. import Headers, Response, Request from . import frame @@ -283,7 +283,7 @@ class HTTP2Protocol(object): def check_alpn(self): alp = self.tcp_handler.get_alpn_proto_negotiated() - if alp != ALPN_PROTO_H2: + if alp != b'h2': raise NotImplementedError( "HTTP2Protocol can not handle unknown ALP: %s" % alp) return True diff --git a/netlib/http/http2/frame.py b/netlib/http/http2/frame.py index cb2cde99..188629d4 100644 --- a/netlib/http/http2/frame.py +++ b/netlib/http/http2/frame.py @@ -25,9 +25,6 @@ ERROR_CODES = BiDi( CLIENT_CONNECTION_PREFACE = b"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" -ALPN_PROTO_H2 = b'h2' - - class Frame(object): """ |