summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2016-06-17 19:52:18 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2016-06-17 19:52:18 (GMT)
commitea93ac013dc0d69c3500f16105fb0f8ea94aba3f (patch)
tree3d43d0bf0c5468a679c4c4258b38badc3bf1107a /Doc
parent99d66f917a60ad556726b497a7d964e4b2ce109d (diff)
downloadcpython-ea93ac013dc0d69c3500f16105fb0f8ea94aba3f.zip
cpython-ea93ac013dc0d69c3500f16105fb0f8ea94aba3f.tar.gz
cpython-ea93ac013dc0d69c3500f16105fb0f8ea94aba3f.tar.bz2
Issue #26536: socket.ioctl now supports SIO_LOOPBACK_FAST_PATH. Patch by Daniel Stokes.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/socket.rst13
-rw-r--r--Doc/whatsnew/3.6.rst8
2 files changed, 20 insertions, 1 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 84286c9..c63c73a 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -329,12 +329,17 @@ Constants
.. versionadded:: 3.3
-.. data:: SIO_*
+.. data:: SIO_RCVALL
+ SIO_KEEPALIVE_VALS
+ SIO_LOOPBACK_FAST_PATH
RCVALL_*
Constants for Windows' WSAIoctl(). The constants are used as arguments to the
:meth:`~socket.socket.ioctl` method of socket objects.
+ .. versionchanged:: 3.6
+ ``SIO_LOOPBACK_FAST_PATH`` was added.
+
.. data:: TIPC_*
@@ -996,6 +1001,12 @@ to sockets.
On other platforms, the generic :func:`fcntl.fcntl` and :func:`fcntl.ioctl`
functions may be used; they accept a socket object as their first argument.
+ Currently only the following control codes are supported:
+ ``SIO_RCVALL``, ``SIO_KEEPALIVE_VALS``, and ``SIO_LOOPBACK_FAST_PATH``.
+
+ .. versionchanged:: 3.6
+ ``SIO_LOOPBACK_FAST_PATH`` was added.
+
.. method:: socket.listen([backlog])
Enable a server to accept connections. If *backlog* is specified, it must
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index 8e166f0..e7e01a6 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -346,6 +346,14 @@ sqlite3
(Contributed by Alex LordThorsen in :issue:`16864`.)
+socket
+------
+
+The :func:`~socket.socket.ioctl` function now supports the :data:`~socket.SIO_LOOPBACK_FAST_PATH`
+control code.
+(Contributed by Daniel Stokes in :issue:`26536`.)
+
+
socketserver
------------