diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-03 17:01:37 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-03 17:01:37 +0200 |
| commit | 8da683a638a6f67db5b55d2089eb0601074793b2 (patch) | |
| tree | 86bfab4dbbc3bcd00b1eadb8bb72bca8bb58d521 /libmproxy/protocol | |
| parent | f4272de5ec77fb57723e2274e4ddc50d73489e1e (diff) | |
| parent | 3a229f60e35a05b0358ef6bf6c81a3a42461c4a2 (diff) | |
| download | mitmproxy-8da683a638a6f67db5b55d2089eb0601074793b2.tar.gz mitmproxy-8da683a638a6f67db5b55d2089eb0601074793b2.tar.bz2 mitmproxy-8da683a638a6f67db5b55d2089eb0601074793b2.zip | |
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/protocol')
| -rw-r--r-- | libmproxy/protocol/http.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index 7768b9ad..3c934393 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -234,7 +234,7 @@ class Http2Layer(_HttpLayer): return if isinstance(frame, PingFrame): # 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 self.log("Unexpected HTTP2 frame from client: %s" % frame.human_readable(), "info") @@ -253,7 +253,7 @@ class Http2Layer(_HttpLayer): return if isinstance(frame, PingFrame): # 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 self.log("Unexpected HTTP2 frame from server: %s" % frame.human_readable(), "info") |