diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-06-08 16:54:19 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-06-08 16:54:19 +0200 |
| commit | fdbb3b76cf8cd7caaa644dc31e48521096ed5349 (patch) | |
| tree | e1585a5f0bf48f981bbfd1d578a3fba848334b13 /netlib | |
| parent | abbe88c8ce4f19de33723ac0828cd24b8ec5f38b (diff) | |
| download | mitmproxy-fdbb3b76cf8cd7caaa644dc31e48521096ed5349.tar.gz mitmproxy-fdbb3b76cf8cd7caaa644dc31e48521096ed5349.tar.bz2 mitmproxy-fdbb3b76cf8cd7caaa644dc31e48521096ed5349.zip | |
http2: add warning if raw data looks like HTTP/1
Diffstat (limited to 'netlib')
| -rw-r--r-- | netlib/http2/frame.py | 4 | ||||
| -rw-r--r-- | netlib/tcp.py | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/netlib/http2/frame.py b/netlib/http2/frame.py index ac9b8d50..4a305d82 100644 --- a/netlib/http2/frame.py +++ b/netlib/http2/frame.py @@ -1,3 +1,4 @@ +import sys import struct from functools import reduce from hpack.hpack import Encoder, Decoder @@ -79,6 +80,9 @@ class Frame(object): flags = fields[3] stream_id = fields[4] + if raw_header[:4] == b'HTTP': # pragma no cover + print >> sys.stderr, "WARNING: This looks like an HTTP/1 connection!" + self._check_frame_size(length, state) payload = fp.safe_read(length) diff --git a/netlib/tcp.py b/netlib/tcp.py index 09c43ffc..62545244 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -501,7 +501,7 @@ class TCPClient(_Connection): def get_alpn_proto_negotiated(self): if OpenSSL._util.lib.Cryptography_HAS_ALPN: return self.connection.get_alpn_proto_negotiated() - else: + else: # pragma no cover return None |