From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 22 Oct 2010 18:44:15 +0000 (+0000)
Subject: For now, remove accept4() code (issue #10115)
X-Git-Tag: v3.2a4~383
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61ec8de8097237e83a42bf6c732abf15c3fd7610;p=thirdparty%2FPython%2Fcpython.git

For now, remove accept4() code (issue #10115)
---

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index d0e1ed6657b1..d340f94be370 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1676,9 +1676,6 @@ sock_accept(PySocketSockObject *s)
     PyObject *addr = NULL;
     PyObject *res = NULL;
     int timeout;
-#ifdef HAVE_ACCEPT4
-    int flags = 0;
-#endif
     if (!getsockaddrlen(s, &addrlen))
         return NULL;
     memset(&addrbuf, 0, addrlen);
@@ -1690,13 +1687,7 @@ sock_accept(PySocketSockObject *s)
     Py_BEGIN_ALLOW_THREADS
     timeout = internal_select_ex(s, 0, interval);
     if (!timeout) {
-#ifdef HAVE_ACCEPT4
-        /* inherit socket flags and use accept4 call */
-        flags = s->sock_type & (SOCK_CLOEXEC | SOCK_NONBLOCK);
-        newfd = accept4(s->sock_fd, SAS2SA(&addrbuf), &addrlen, flags);
-#else
         newfd = accept(s->sock_fd, SAS2SA(&addrbuf), &addrlen);
-#endif /* HAVE_ACCEPT4  */
     }
     Py_END_ALLOW_THREADS