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 mitmproxy/mitmproxy#375

Browse Source
This commit is contained in:
Maximilian Hils 2014-10-17 18:48:30 +02:00
parent e6a8730f98
commit 29a4e91050
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netlib/tcp.py
View File

@ -243,12 +243,21 @@ class _Connection(object):
# pending readable data could lead to an immediate RST being sent (which is the case on Windows). # pending readable data could lead to an immediate RST being sent (which is the case on Windows).
# http://ia600609.us.archive.org/22/items/TheUltimateSo_lingerPageOrWhyIsMyTcpNotReliable/the-ultimate-so_linger-page-or-why-is-my-tcp-not-reliable.html # http://ia600609.us.archive.org/22/items/TheUltimateSo_lingerPageOrWhyIsMyTcpNotReliable/the-ultimate-so_linger-page-or-why-is-my-tcp-not-reliable.html
# #
# However, we cannot rely on the shutdown()-followed-by-read()-eof technique proposed by the page above:
# Some remote machines just don't send a TCP FIN, which would leave us in the unfortunate situation that
# recv() would block infinitely.
# As a workaround, we set a timeout here even if we were in blocking mode.
# Please let us know if you have a better solution to this problem.
#
# Do not call this for every SSL.Connection: # Do not call this for every SSL.Connection:
# If the SSL handshake failed at the first place, OpenSSL's SSL_read tries to negotiate the connection # If the SSL handshake failed at the first place, OpenSSL's SSL_read tries to negotiate the connection
# again at this point, calls the SNI handler and segfaults. # again at this point, calls the SNI handler and segfaults.
# https://github.com/mitmproxy/mitmproxy/issues/373#issuecomment-58383499 # https://github.com/mitmproxy/mitmproxy/issues/373#issuecomment-58383499
timeout = self.connection.gettimeout()
self.connection.settimeout(timeout or 60)
while self.connection.recv(4096): # pragma: no cover while self.connection.recv(4096): # pragma: no cover
pass pass
self.connection.settimeout(timeout)
self.connection.close() self.connection.close()
except (socket.error, SSL.Error, IOError): except (socket.error, SSL.Error, IOError):