diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-02-02 17:48:09 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-02-04 09:52:29 +0100 |
| commit | ca5cc34d0b70f3306f62004be7ceb3f0c2053da7 (patch) | |
| tree | d4c283deb28ad3f4184bc55a5900afea40437d2f | |
| parent | 68bcc82b8e4c219b024bff0081741c799b9cbd74 (diff) | |
| download | mitmproxy-ca5cc34d0b70f3306f62004be7ceb3f0c2053da7.tar.gz mitmproxy-ca5cc34d0b70f3306f62004be7ceb3f0c2053da7.tar.bz2 mitmproxy-ca5cc34d0b70f3306f62004be7ceb3f0c2053da7.zip | |
cleanup
| -rw-r--r-- | libmproxy/protocol/http2.py | 14 | ||||
| -rw-r--r-- | test/test_protocol_http2.py | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libmproxy/protocol/http2.py b/libmproxy/protocol/http2.py index fe9f8695..e617f77c 100644 --- a/libmproxy/protocol/http2.py +++ b/libmproxy/protocol/http2.py @@ -61,7 +61,7 @@ class SafeH2Connection(H2Connection): def safe_send_headers(self, is_zombie, stream_id, headers): with self.lock: - if is_zombie(self, stream_id): + if is_zombie(): return self.send_headers(stream_id, headers) self.conn.send(self.data_to_send()) @@ -71,7 +71,7 @@ class SafeH2Connection(H2Connection): position = 0 while position < len(chunk): self.lock.acquire() - if is_zombie(self, stream_id): + if is_zombie(): self.lock.release() return max_outbound_frame_size = self.max_outbound_frame_size @@ -85,7 +85,7 @@ class SafeH2Connection(H2Connection): self.lock.release() position += max_outbound_frame_size with self.lock: - if is_zombie(self, stream_id): + if is_zombie(): return self.end_stream(stream_id) self.conn.send(self.data_to_send()) @@ -246,10 +246,8 @@ class Http2SingleStreamLayer(_HttpTransmissionLayer, threading.Thread): self.response_arrived = threading.Event() self.data_finished = threading.Event() - def is_zombie(self, h2_conn, stream_id): - if self.zombie: - return True - return False + def is_zombie(self): + return self.zombie is not None def read_request(self): self.data_finished.wait() @@ -300,6 +298,8 @@ class Http2SingleStreamLayer(_HttpTransmissionLayer, threading.Thread): ) def send_request(self, message): + if self.zombie: + return with self.server_conn.h2.lock: self.server_stream_id = self.server_conn.h2.get_next_available_stream_id() self.server_to_client_stream_ids[self.server_stream_id] = self.client_stream_id diff --git a/test/test_protocol_http2.py b/test/test_protocol_http2.py index dce8c5da..cc62f734 100644 --- a/test/test_protocol_http2.py +++ b/test/test_protocol_http2.py @@ -384,6 +384,6 @@ class TestPushPromise(_Http2TestBase, _Http2ServerBase): client.wfile.flush() bodies = [flow.response.body for flow in self.master.state.flows if flow.response] - assert len(bodies) == 3 + assert len(bodies) >= 1 assert b'regular_stream' in bodies # the other two bodies might not be transmitted before the reset |