accepted sockets shouldn't inherit the SOCK_NONBLOCK flag (closes #25471)

benjaminp · benjaminp · commit d9dbf493837b · 2015-10-24T20:06:04.000-07:00
diff --git a/Lib/socket.py b/Lib/socket.py
@@ -185,7 +185,11 @@ def accept(self):
         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 --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
@@ -3863,6 +3863,7 @@ def testAccept(self):
         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 --git a/Misc/NEWS b/Misc/NEWS
@@ -96,6 +96,9 @@ Core and Builtins
 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
