mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-08 08:01:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Issue #7995: When calling accept() on a socket with a timeout, the returned

Browse source 
socket is now always non-blocking, regardless of the operating system.
This commit is contained in:
Antoine Pitrou 2011-01-05 21:03:42 +00:00
parent 7d967712b8
commit 600232b562
3 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/socket.py
View file

@ -130,7 +130,13 @@ class socket(_socket.socket):
For IP sockets, the address info is a pair (hostaddr, port).
"""
fd, addr = self._accept()
return socket(self.family, self.type, self.proto, fileno=fd), addr
sock = socket(self.family, self.type, self.proto, fileno=fd)
# Issue #7995: if no default timeout is set and the listening
# socket had a (non-zero) timeout, force the new socket in blocking
# mode to override platform-specific socket flags inheritance.
if getdefaulttimeout() is None and self.gettimeout():
sock.setblocking(True)
return sock, addr
def makefile(self, mode="r", buffering=None, *,
encoding=None, errors=None, newline=None):