diff options
| author | Jason <jason.daurus@gmail.com> | 2016-06-24 21:04:39 +0800 |
|---|---|---|
| committer | Jason <jason.daurus@gmail.com> | 2016-06-24 21:04:39 +0800 |
| commit | 5a1677c3879c53abcaddbbfa4894fa8a117a3143 (patch) | |
| tree | adf5c9cdd79ea5d519420e0e3328ac92e1ad9dc3 /netlib/http | |
| parent | f392b8e34cae2d985c500ddc26a93c8f620a6f57 (diff) | |
| parent | 21c3480429108cbbd45f5ae3de7a36d15460cdc3 (diff) | |
| download | mitmproxy-5a1677c3879c53abcaddbbfa4894fa8a117a3143.tar.gz mitmproxy-5a1677c3879c53abcaddbbfa4894fa8a117a3143.tar.bz2 mitmproxy-5a1677c3879c53abcaddbbfa4894fa8a117a3143.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy into list
Conflicts:
mitmproxy/web/static/app.js
web/src/js/app.jsx
web/src/js/connection.js
web/src/js/ducks/websocket.js
Diffstat (limited to 'netlib/http')
| -rw-r--r-- | netlib/http/http2/framereader.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/netlib/http/http2/framereader.py b/netlib/http/http2/framereader.py index d45be646..eb9b069a 100644 --- a/netlib/http/http2/framereader.py +++ b/netlib/http/http2/framereader.py @@ -1,6 +1,7 @@ import codecs import hyperframe +from ...exceptions import HttpException def http2_read_raw_frame(rfile): @@ -8,7 +9,7 @@ def http2_read_raw_frame(rfile): length = int(codecs.encode(header[:3], 'hex_codec'), 16) if length == 4740180: - raise ValueError("Length field looks more like HTTP/1.1: %s" % rfile.peek(20)) + raise HttpException("Length field looks more like HTTP/1.1:\n{}".format(rfile.read(-1))) body = rfile.safe_read(length) return [header, body] |