From d8ae7c3e29bcf117eb051f9e74b76fea733c1c64 Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Mon, 1 Feb 2016 23:03:15 +0100 Subject: fix tests and use netlib utils --- libmproxy/protocol/http2.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libmproxy/protocol/http2.py') diff --git a/libmproxy/protocol/http2.py b/libmproxy/protocol/http2.py index 5c4586de..4b582f51 100644 --- a/libmproxy/protocol/http2.py +++ b/libmproxy/protocol/http2.py @@ -7,6 +7,7 @@ import Queue from netlib.tcp import ssl_read_select from netlib.exceptions import HttpException from netlib.http import Headers +from netlib.utils import http2_read_raw_frame import h2 from h2.connection import H2Connection @@ -212,7 +213,7 @@ class Http2Layer(Layer): with source_conn.h2.lock: try: - raw_frame = utils.http2_read_frame(source_conn.rfile) + raw_frame = b''.join(http2_read_raw_frame(source_conn.rfile)) except: for stream in self.streams.values(): stream.zombie = time.time() -- cgit v1.2.3