Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 08:11:00 +00:00
Code Issues Projects Releases Wiki Activity

kill streams if connection gets terminated

Browse Source
This commit is contained in:
Thomas Kriechbaumer 2016-05-21 20:18:49 +02:00
parent 6965c93be6
commit 85a3a92a8a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mitmproxy/protocol/http2.py
View File

@ -209,6 +209,11 @@ class Http2Layer(Layer):
if zombie and zombie <= death_time: if zombie and zombie <= death_time:
self.streams.pop(stream_id, None) self.streams.pop(stream_id, None)
def _kill_all_streams(self):
for stream in self.streams.values():
if not stream.zombie:
stream.zombie = time.time()
def __call__(self): def __call__(self):
if self.server_conn: if self.server_conn:
self._initiate_server_conn() self._initiate_server_conn()
@ -230,9 +235,7 @@ class Http2Layer(Layer):
raw_frame = b''.join(http2_read_raw_frame(source_conn.rfile)) raw_frame = b''.join(http2_read_raw_frame(source_conn.rfile))
except: except:
# read frame failed: connection closed # read frame failed: connection closed
# kill all streams self._kill_all_streams()
for stream in self.streams.values():
stream.zombie = time.time()
return return
incoming_events = source_conn.h2.receive_data(raw_frame) incoming_events = source_conn.h2.receive_data(raw_frame)
@ -240,6 +243,8 @@ class Http2Layer(Layer):
for event in incoming_events: for event in incoming_events:
if not self._handle_event(event, source_conn, other_conn, is_server): if not self._handle_event(event, source_conn, other_conn, is_server):
# connection terminated: GoAway
self._kill_all_streams()
return return
self._cleanup_streams() self._cleanup_streams()