diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-10-22 18:44:15 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-10-22 18:44:15 (GMT) |
| commit | 61ec8de8097237e83a42bf6c732abf15c3fd7610 (patch) | |
| tree | 5c8d47f4d426cd3c1f5975ce2aa4aa181b878e9b | |
| parent | eb585adbde24fc40f95a8bdf8099d71e82ce50ec (diff) | |
| download | cpython-61ec8de8097237e83a42bf6c732abf15c3fd7610.zip cpython-61ec8de8097237e83a42bf6c732abf15c3fd7610.tar.gz cpython-61ec8de8097237e83a42bf6c732abf15c3fd7610.tar.bz2 | |
For now, remove accept4() code (issue #10115)
| -rw-r--r-- | Modules/socketmodule.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index d0e1ed6..d340f94 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 |