diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-01-23 11:30:00 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2017-01-23 11:30:00 (GMT) |
| commit | 01f5ae7b76236a19c670d107b06b68ccb69f532f (patch) | |
| tree | e872de7bc7b973c2de31e5c1f433064de1154706 /Doc | |
| parent | ad9422559fc9845d043009f136ee5019a09bbb7e (diff) | |
| download | cpython-01f5ae7b76236a19c670d107b06b68ccb69f532f.zip cpython-01f5ae7b76236a19c670d107b06b68ccb69f532f.tar.gz cpython-01f5ae7b76236a19c670d107b06b68ccb69f532f.tar.bz2 | |
Issue #26273: Document TCP_USER_TIMEOUT and TCP_CONGESTION
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/socket.rst | 4 | ||||
| -rw-r--r-- | Doc/whatsnew/3.6.rst | 3 |
2 files changed, 5 insertions, 2 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 ------------ |