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

Merge pull request #1870 from Kriechi/http2-timeouts

Browse Source 
http2: faster timeouts
This commit is contained in:
Thomas Kriechbaumer 2016-12-17 10:45:34 +01:00 committed by GitHub
commit 39a251a988
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,7 +328,7 @@ class Http2Layer(base.Layer):
try: try:
while True: while True:
r = tcp.ssl_read_select(conns, 1) r = tcp.ssl_read_select(conns, 0.1)
for conn in r: for conn in r:
source_conn = self.client_conn if conn == self.client_conn.connection else self.server_conn source_conn = self.client_conn if conn == self.client_conn.connection else self.server_conn
other_conn = self.server_conn if conn == self.client_conn.connection else self.client_conn other_conn = self.server_conn if conn == self.client_conn.connection else self.client_conn
@ -580,7 +580,7 @@ class Http2SingleStreamLayer(httpbase._HttpTransmissionLayer, basethread.BaseThr
def read_response_body(self, request, response): def read_response_body(self, request, response):
while True: while True:
try: try:
yield self.response_data_queue.get(timeout=1) yield self.response_data_queue.get(timeout=0.1)
except queue.Empty: # pragma: no cover except queue.Empty: # pragma: no cover
pass pass
if self.response_data_finished.is_set(): if self.response_data_finished.is_set():