summaryrefslogtreecommitdiffstats
path: root/Modules/socketmodule.c
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-05-10 17:16:03 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-05-10 17:16:03 (GMT)
commit47d1d0dc30a81f507fd51cd4c2abfaec735fdf13 (patch)
tree8d3cfe4bebda74e33650984ba8d8f7594e26a545 /Modules/socketmodule.c
parent351761236adc0196160370d09d818ffa7d4238ac (diff)
downloadcpython-47d1d0dc30a81f507fd51cd4c2abfaec735fdf13.zip
cpython-47d1d0dc30a81f507fd51cd4c2abfaec735fdf13.tar.gz
cpython-47d1d0dc30a81f507fd51cd4c2abfaec735fdf13.tar.bz2
Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in
order to accept exactly one connection. Patch by Daniel Evers.
Diffstat (limited to 'Modules/socketmodule.c')
-rw-r--r--Modules/socketmodule.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 96b83b1..76d860c 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -2244,8 +2244,10 @@ sock_listen(PySocketSockObject *s, PyObject *arg)
if (backlog == -1 && PyErr_Occurred())
return NULL;
Py_BEGIN_ALLOW_THREADS
- if (backlog < 1)
- backlog = 1;
+ /* To avoid problems on systems that don't allow a negative backlog
+ * (which doesn't make sense anyway) we force a minimum value of 0. */
+ if (backlog < 0)
+ backlog = 0;
res = listen(s->sock_fd, backlog);
Py_END_ALLOW_THREADS
if (res < 0)
@@ -2258,8 +2260,9 @@ PyDoc_STRVAR(listen_doc,
"listen(backlog)\n\
\n\
Enable a server to accept connections. The backlog argument must be at\n\
-least 1; it specifies the number of unaccepted connection that the system\n\
-will allow before refusing new connections.");
+least 0 (if it is lower, it is set to 0); it specifies the number of\n\
+unaccepted connections that the system will allow before refusing new\n\
+connections.");
#ifndef NO_DUP