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

fix #2201

Browse Source
This commit is contained in:
Thomas Kriechbaumer 2017-03-25 16:41:53 +01:00
parent c6a16e95e8
commit 20776cf2fa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mitmproxy/proxy/protocol/http2.py
View File

@ -62,7 +62,7 @@ class SafeH2Connection(connection.H2Connection):
raise_zombie(self.lock.release) raise_zombie(self.lock.release)
max_outbound_frame_size = self.max_outbound_frame_size max_outbound_frame_size = self.max_outbound_frame_size
frame_chunk = chunk[position:position + max_outbound_frame_size] frame_chunk = chunk[position:position + max_outbound_frame_size]
if self.local_flow_control_window(stream_id) < len(frame_chunk): if self.local_flow_control_window(stream_id) < len(frame_chunk): # pragma: no cover
self.lock.release() self.lock.release()
time.sleep(0.1) time.sleep(0.1)
continue continue
@ -362,7 +362,7 @@ class Http2Layer(base.Layer):
self._kill_all_streams() self._kill_all_streams()
def detect_zombie_stream(func): def detect_zombie_stream(func): # pragma: no cover
@functools.wraps(func) @functools.wraps(func)
def wrapper(self, *args, **kwargs): def wrapper(self, *args, **kwargs):
self.raise_zombie() self.raise_zombie()
@ -454,7 +454,7 @@ class Http2SingleStreamLayer(httpbase._HttpTransmissionLayer, basethread.BaseThr
else: else:
return self.request_data_finished return self.request_data_finished
def raise_zombie(self, pre_command=None): def raise_zombie(self, pre_command=None): # pragma: no cover
connection_closed = self.h2_connection.state_machine.state == h2.connection.ConnectionState.CLOSED connection_closed = self.h2_connection.state_machine.state == h2.connection.ConnectionState.CLOSED
if self.zombie is not None or connection_closed: if self.zombie is not None or connection_closed:
if pre_command is not None: if pre_command is not None:
@ -626,7 +626,7 @@ class Http2SingleStreamLayer(httpbase._HttpTransmissionLayer, basethread.BaseThr
self.log(repr(e), "info") self.log(repr(e), "info")
except exceptions.SetServerNotAllowedException as e: # pragma: no cover except exceptions.SetServerNotAllowedException as e: # pragma: no cover
self.log("Changing the Host server for HTTP/2 connections not allowed: {}".format(e), "info") self.log("Changing the Host server for HTTP/2 connections not allowed: {}".format(e), "info")
except exceptions.Kill: except exceptions.Kill: # pragma: no cover
self.log("Connection killed", "info") self.log("Connection killed", "info")
self.kill() self.kill()