1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Antoine Pitrou 2010-10-22 18:44:15 +00:00
parent eb585adbde
commit 61ec8de809
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/socketmodule.c
View File

@ -1676,9 +1676,6 @@ sock_accept(PySocketSockObject *s)
PyObject *addr = NULL; PyObject *addr = NULL;
PyObject *res = NULL; PyObject *res = NULL;
int timeout; int timeout;
#ifdef HAVE_ACCEPT4
int flags = 0;
#endif
if (!getsockaddrlen(s, &addrlen)) if (!getsockaddrlen(s, &addrlen))
return NULL; return NULL;
memset(&addrbuf, 0, addrlen); memset(&addrbuf, 0, addrlen);
@ -1690,13 +1687,7 @@ sock_accept(PySocketSockObject *s)
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
timeout = internal_select_ex(s, 0, interval); timeout = internal_select_ex(s, 0, interval);
if (!timeout) { 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); newfd = accept(s->sock_fd, SAS2SA(&addrbuf), &addrlen);
#endif /* HAVE_ACCEPT4 */
} }
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS