diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-01-23 12:30:00 +0100 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2017-01-23 12:30:00 +0100 |
| commit | 8bc96d38198140539ba2f1f2e3572f8987a5ae15 (patch) | |
| tree | 950606057bae7392ae8d122cb1f978dc35dbf763 /Doc | |
| parent | c0f01d9eb22ed81c49d8c9fbfd49b6d4c4020310 (diff) | |
| download | cpython-8bc96d38198140539ba2f1f2e3572f8987a5ae15.tar.gz | |
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 c21cb7fd10..678e32ce57 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 f6c71d374c..96fd256b99 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 ------------ |