diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2019-04-09 04:42:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-09 04:42:06 +0200 |
| commit | 8702b67dad62a9084f6c1823dce10653743667c8 (patch) | |
| tree | e43d21d01315d3543754a3e43119e5158d6f5dbd | |
| parent | 79b5d29041bd85ea3baa050b3fa2481344ea35c9 (diff) | |
| download | cpython-git-8702b67dad62a9084f6c1823dce10653743667c8.tar.gz | |
BPO-17561: set create_server backlog default to None (GH-12735)
It turns out doing socket.listen(0) does not equal to "choose a
reasonable default". It actually means "set backlog to 0".
As such set backlog=None as the default for socket.create_server.
Fixes the following BB failures:
https://github.com/python/cpython/pull/11784#issuecomment-481036369
Ref. BPO-1756, GH-11784.
| -rw-r--r-- | Doc/library/socket.rst | 2 | ||||
| -rw-r--r-- | Lib/socket.py | 7 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2019-04-09-04-08-46.bpo-17561.hOhVnh.rst | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index b4a07bd5d5..62c8347027 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -595,7 +595,7 @@ The following functions all create :ref:`socket objects <socket-objects>`. .. versionchanged:: 3.2 *source_address* was added. -.. function:: create_server(address, *, family=AF_INET, backlog=0, reuse_port=False, dualstack_ipv6=False) +.. function:: create_server(address, *, family=AF_INET, backlog=None, reuse_port=False, dualstack_ipv6=False) Convenience function which creates a TCP socket bound to *address* (a 2-tuple ``(host, port)``) and return the socket object. diff --git a/Lib/socket.py b/Lib/socket.py index 2e51cd16f3..0dd8ec70e1 100644 --- a/Lib/socket.py +++ b/Lib/socket.py @@ -745,7 +745,7 @@ def has_dualstack_ipv6(): return False -def create_server(address, *, family=AF_INET, backlog=0, reuse_port=False, +def create_server(address, *, family=AF_INET, backlog=None, reuse_port=False, dualstack_ipv6=False): """Convenience function which creates a SOCK_STREAM type socket bound to *address* (a 2-tuple (host, port)) and return the socket @@ -804,7 +804,10 @@ def create_server(address, *, family=AF_INET, backlog=0, reuse_port=False, msg = '%s (while attempting to bind on address %r)' % \ (err.strerror, address) raise error(err.errno, msg) from None - sock.listen(backlog) + if backlog is None: + sock.listen() + else: + sock.listen(backlog) return sock except error: sock.close() diff --git a/Misc/NEWS.d/next/Library/2019-04-09-04-08-46.bpo-17561.hOhVnh.rst b/Misc/NEWS.d/next/Library/2019-04-09-04-08-46.bpo-17561.hOhVnh.rst new file mode 100644 index 0000000000..e281c22305 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-04-09-04-08-46.bpo-17561.hOhVnh.rst @@ -0,0 +1 @@ +Set backlog=None as the default for socket.create_server. |