diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-09-04 11:02:48 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-04 11:02:48 +1200 |
| commit | 0483486c628d0e590231ed44bf5a3656122c543e (patch) | |
| tree | a8d389eac26a375aa581a4372ac21a7da573fb39 /netlib/http/http2/framereader.py | |
| parent | b476966a45a6f77b1a819867dbbc943af9a57ef0 (diff) | |
| parent | 3da9e37d9eb346f8e9cf4ab1b3be15abc1051f57 (diff) | |
| download | mitmproxy-0483486c628d0e590231ed44bf5a3656122c543e.tar.gz mitmproxy-0483486c628d0e590231ed44bf5a3656122c543e.tar.bz2 mitmproxy-0483486c628d0e590231ed44bf5a3656122c543e.zip | |
Merge pull request #1523 from Kriechi/http2
improve error handling in http2
Diffstat (limited to 'netlib/http/http2/framereader.py')
| -rw-r--r-- | netlib/http/http2/framereader.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/netlib/http/http2/framereader.py b/netlib/http/http2/framereader.py index eb9b069a..8b7cfffb 100644 --- a/netlib/http/http2/framereader.py +++ b/netlib/http/http2/framereader.py @@ -4,7 +4,7 @@ import hyperframe from ...exceptions import HttpException -def http2_read_raw_frame(rfile): +def read_raw_frame(rfile): header = rfile.safe_read(9) length = int(codecs.encode(header[:3], 'hex_codec'), 16) @@ -15,8 +15,11 @@ def http2_read_raw_frame(rfile): return [header, body] -def http2_read_frame(rfile): - header, body = http2_read_raw_frame(rfile) +def parse_frame(header, body=None): + if body is None: + body = header[9:] + header = header[:9] + frame, length = hyperframe.frame.Frame.parse_frame_header(header) frame.parse_body(memoryview(body)) return frame |