merge 3.4 (#25471)

2 files changed, 6 insertions, 1 deletions

diff --git a/Lib/socket.py b/Lib/socket.py
index db34ab3..ed1b10a 100644
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -193,7 +193,11 @@ class socket(_socket.socket):
         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
index 17819f2..63cc284 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -3866,6 +3866,7 @@ class NonBlockingTCPTests(ThreadedTCPSocketTest):
         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.")