diff options
| -rw-r--r-- | Doc/library/socket.rst | 4 | ||||
| -rw-r--r-- | Doc/whatsnew/3.6.rst | 3 | ||||
| -rw-r--r-- | Misc/NEWS | 8 |
3 files changed, 9 insertions, 6 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index c21cb7f..678e32c 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -300,8 +300,8 @@ Constants provided. .. versionchanged:: 3.6 - ``SO_DOMAIN``, ``SO_PROTOCOL``, ``SO_PEERSEC``, ``SO_PASSSEC`` - were added. + ``SO_DOMAIN``, ``SO_PROTOCOL``, ``SO_PEERSEC``, ``SO_PASSSEC``, + ``TCP_USER_TIMEOUT``, ``TCP_CONGESTION`` were added. .. data:: AF_CAN PF_CAN diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst index f6c71d3..96fd256 100644 --- a/Doc/whatsnew/3.6.rst +++ b/Doc/whatsnew/3.6.rst @@ -1371,6 +1371,9 @@ The socket module now supports the address family (Contributed by Christian Heimes in :issue:`27744` with support from Victor Stinner.) +New Linux constants ``TCP_USER_TIMEOUT`` and ``TCP_CONGESTION`` were added. +(Contributed by Omar Sandoval, issue:`26273`). + socketserver ------------ @@ -256,6 +256,10 @@ Library may be revisited again after the Python 2.7 branch is no longer officially supported. +- Issue #26273: Add new :data:`socket.TCP_CONGESTION` (Linux 2.6.13) and + :data:`socket.TCP_USER_TIMEOUT` (Linux 2.6.37) constants. Patch written by + Omar Sandoval. + - Issue #24142: Reading a corrupt config file left configparser in an invalid state. Original patch by Florian Höch. @@ -323,10 +327,6 @@ Core and Builtins Library ------- -- Issue #26273: Add new :data:`socket.TCP_CONGESTION` (Linux 2.6.13) and - :data:`socket.TCP_USER_TIMEOUT` (Linux 2.6.37) constants. Patch written by - Omar Sandoval. - - Issue #28752: Restored the __reduce__() methods of datetime objects. - Issue #28727: Regular expression patterns, _sre.SRE_Pattern objects created |