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-04 00:46:51 +02:00
parent a18db90ea3 47ab7f04ea
commit ee8e5947df
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libmproxy/protocol/http.py
View File

@ -232,10 +232,6 @@ class Http2Layer(_HttpLayer):
# relay it to the server.
self.server_conn.send(frame.to_bytes())
return
if isinstance(frame, PingFrame):
# respond with pong
self.client_conn.send(PingFrame(flags=Frame.FLAG_ACK, payload=frame.payload).to_bytes())
return
self.log("Unexpected HTTP2 frame from client: %s" % frame.human_readable(), "info")
def handle_unexpected_frame_from_server(self, frame):
@ -251,10 +247,6 @@ class Http2Layer(_HttpLayer):
# relay it to the client.
self.client_conn.send(frame.to_bytes())
return
if isinstance(frame, PingFrame):
# respond with pong
self.server_conn.send(PingFrame(flags=Frame.FLAG_ACK, payload=frame.payload).to_bytes())
return
self.log("Unexpected HTTP2 frame from server: %s" % frame.human_readable(), "info")