aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol/http2.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-02-14 16:37:20 +0100
committerMaximilian Hils <git@maximilianhils.com>2016-02-14 16:37:20 +0100
commitced78ba1075289d0df716b1541a91929d7c91de9 (patch)
tree796235d2725735bb4f94363ae9eba35c843e9642 /libmproxy/protocol/http2.py
parent885e619a7e5a1a0263c0b751d8ef924522978b56 (diff)
parentea0ba6d143106eafaf6bbc15ee60e0fe82c049c0 (diff)
downloadmitmproxy-ced78ba1075289d0df716b1541a91929d7c91de9.tar.gz
mitmproxy-ced78ba1075289d0df716b1541a91929d7c91de9.tar.bz2
mitmproxy-ced78ba1075289d0df716b1541a91929d7c91de9.zip
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/protocol/http2.py')
-rw-r--r--libmproxy/protocol/http2.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/libmproxy/protocol/http2.py b/libmproxy/protocol/http2.py
index 04ff8bf6..c121637c 100644
--- a/libmproxy/protocol/http2.py
+++ b/libmproxy/protocol/http2.py
@@ -18,8 +18,6 @@ from .base import Layer
from .http import _HttpTransmissionLayer, HttpLayer
from .. import utils
from ..models import HTTPRequest, HTTPResponse
-from ..exceptions import HttpProtocolException
-from ..exceptions import ProtocolException
class SafeH2Connection(H2Connection):
@@ -131,6 +129,12 @@ class Http2Layer(Layer):
raise NotImplementedError()
def _handle_event(self, event, source_conn, other_conn, is_server):
+ self.log(
+ "HTTP2 Event from {}".format("server" if is_server else "client"),
+ "debug",
+ [repr(event)]
+ )
+
if hasattr(event, 'stream_id'):
if is_server and event.stream_id % 2 == 1:
eid = self.server_to_client_stream_ids[event.stream_id]
@@ -228,7 +232,6 @@ class Http2Layer(Layer):
stream.zombie = time.time()
return
-
frame, _ = hyperframe.frame.Frame.parse_frame_header(raw_frame[:9])
if is_server: