Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mitmproxy/mitmproxy

This commit is contained in:
Maximilian Hils 2015-09-03 17:01:37 +02:00
parent f4272de5ec 3a229f60e3
commit 8da683a638
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmproxy/protocol/http.py
View File

@ -234,7 +234,7 @@ class Http2Layer(_HttpLayer):
return return
if isinstance(frame, PingFrame): if isinstance(frame, PingFrame):
# respond with pong # respond with pong
self.server_conn.send(PingFrame(flags=Frame.FLAG_ACK, payload=frame.payload).to_bytes()) self.client_conn.send(PingFrame(flags=Frame.FLAG_ACK, payload=frame.payload).to_bytes())
return return
self.log("Unexpected HTTP2 frame from client: %s" % frame.human_readable(), "info") self.log("Unexpected HTTP2 frame from client: %s" % frame.human_readable(), "info")
@ -253,7 +253,7 @@ class Http2Layer(_HttpLayer):
return return
if isinstance(frame, PingFrame): if isinstance(frame, PingFrame):
# respond with pong # respond with pong
self.client_conn.send(PingFrame(flags=Frame.FLAG_ACK, payload=frame.payload).to_bytes()) self.server_conn.send(PingFrame(flags=Frame.FLAG_ACK, payload=frame.payload).to_bytes())
return return
self.log("Unexpected HTTP2 frame from server: %s" % frame.human_readable(), "info") self.log("Unexpected HTTP2 frame from server: %s" % frame.human_readable(), "info")