changeset:   98853:10e044a734f3
branch:      3.4
parent:      98849:6a15845142ec
user:        Benjamin Peterson <benjamin@python.org>
date:        Sat Oct 24 20:06:04 2015 -0700
files:       Lib/socket.py Lib/test/test_socket.py Misc/NEWS
description:
accepted sockets shouldn't inherit the SOCK_NONBLOCK flag (closes #25471)


diff -r 6a15845142ec -r 10e044a734f3 Lib/socket.py
--- a/Lib/socket.py	Sat Oct 24 17:39:36 2015 +0300
+++ b/Lib/socket.py	Sat Oct 24 20:06:04 2015 -0700
@@ -185,7 +185,11 @@
         For IP sockets, the address info is a pair (hostaddr, port).
         """
         fd, addr = self._accept()
-        sock = socket(self.family, self.type, self.proto, fileno=fd)
+        # If our type has the SOCK_NONBLOCK flag, we shouldn't pass it onto the
+        # new socket. We do not currently allow passing SOCK_NONBLOCK to
+        # accept4, so the returned socket is always blocking.
+        type = self.type & ~globals().get("SOCK_NONBLOCK", 0)
+        sock = socket(self.family, 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.
diff -r 6a15845142ec -r 10e044a734f3 Lib/test/test_socket.py
--- a/Lib/test/test_socket.py	Sat Oct 24 17:39:36 2015 +0300
+++ b/Lib/test/test_socket.py	Sat Oct 24 20:06:04 2015 -0700
@@ -3863,6 +3863,7 @@
         read, write, err = select.select([self.serv], [], [])
         if self.serv in read:
             conn, addr = self.serv.accept()
+            self.assertIsNone(conn.gettimeout())
             conn.close()
         else:
             self.fail("Error trying to do accept after select.")
diff -r 6a15845142ec -r 10e044a734f3 Misc/NEWS
--- a/Misc/NEWS	Sat Oct 24 17:39:36 2015 +0300
+++ b/Misc/NEWS	Sat Oct 24 20:06:04 2015 -0700
@@ -96,6 +96,9 @@
 Library
 -------
 
+- Issue #25471: Sockets returned from accept() shouldn't appear to be
+  nonblocking.
+
 - Issue #25441: asyncio: Raise error from drain() when socket is closed.
 
 - Issue #25411: Improved Unicode support in SMTPHandler through better use of