aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-04 00:47:04 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-04 00:47:04 +0200
commite88c7e4c58a862d6a222d1f8d4638102228b929e (patch)
treea801f9bc87ff8f6a7e0cedc37ab57c2edc69cb4a /libmproxy/protocol
parent2d1c382f38d3b1cf9219ddb9b62ef196a4381976 (diff)
parentee8e5947df4af80d85d255d087f94a5f98722ef0 (diff)
downloadmitmproxy-e88c7e4c58a862d6a222d1f8d4638102228b929e.tar.gz
mitmproxy-e88c7e4c58a862d6a222d1f8d4638102228b929e.tar.bz2
mitmproxy-e88c7e4c58a862d6a222d1f8d4638102228b929e.zip
Merge branch 'master' into readthedocs
Diffstat (limited to 'libmproxy/protocol')
-rw-r--r--libmproxy/protocol/http.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py
index f2265c34..74c93e16 100644
--- a/libmproxy/protocol/http.py
+++ b/libmproxy/protocol/http.py
@@ -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")