diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-04 00:46:51 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-04 00:46:51 +0200 |
| commit | ee8e5947df4af80d85d255d087f94a5f98722ef0 (patch) | |
| tree | 435a044143af3787862bc0a2888273ee02d6728c | |
| parent | a18db90ea3123b37e3f1fd3f10da001a8ea893c2 (diff) | |
| parent | 47ab7f04eaa85dda7be524b946c22222b2a6de91 (diff) | |
| download | mitmproxy-ee8e5947df4af80d85d255d087f94a5f98722ef0.tar.gz mitmproxy-ee8e5947df4af80d85d255d087f94a5f98722ef0.tar.bz2 mitmproxy-ee8e5947df4af80d85d255d087f94a5f98722ef0.zip | |
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
| -rw-r--r-- | libmproxy/protocol/http.py | 8 |
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") |