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

tcp: As of Python 3.5, EINTR is retried automatically by select

Browse Source 
See https://www.python.org/dev/peps/pep-0475/
This commit is contained in:
Aldo Cortesi 2018-04-18 08:22:26 +12:00
parent 8396244729
commit bca0275427
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mitmproxy/net/tcp.py
View File

@ -22,8 +22,6 @@ socket_fileobject = socket.SocketIO
# Python 3.6 for Windows is missing a constant # Python 3.6 for Windows is missing a constant
IPPROTO_IPV6 = getattr(socket, "IPPROTO_IPV6", 41) IPPROTO_IPV6 = getattr(socket, "IPPROTO_IPV6", 41)
EINTR = 4
class _FileLike: class _FileLike:
BLOCKSIZE = 1024 * 32 BLOCKSIZE = 1024 * 32
@ -595,14 +593,7 @@ class TCPServer:
self.__is_shut_down.clear() self.__is_shut_down.clear()
try: try:
while not self.__shutdown_request: while not self.__shutdown_request:
try: r, w_, e_ = select.select([self.socket], [], [], poll_interval)
r, w_, e_ = select.select(
[self.socket], [], [], poll_interval)
except select.error as ex: # pragma: no cover
if ex[0] == EINTR:
continue
else:
raise
if self.socket in r: if self.socket in r:
connection, client_address = self.socket.accept() connection, client_address = self.socket.accept()
t = basethread.BaseThread( t = basethread.BaseThread(