summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-09-21 16:41:46 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-09-21 16:41:46 (GMT)
commit996572ca3fc6589605ad68b1d3d9c3bc8217a185 (patch)
treef68cf23697ad8a9c29792e2b6f32d05757ef2355 /Doc/library
parenta6d5130c4d4319a2e8d74e66ad3bdbd9acd6a797 (diff)
parent7b58a2bb1d904850293694b01de3bd21344d0ff2 (diff)
downloadcpython-996572ca3fc6589605ad68b1d3d9c3bc8217a185.zip
cpython-996572ca3fc6589605ad68b1d3d9c3bc8217a185.tar.gz
cpython-996572ca3fc6589605ad68b1d3d9c3bc8217a185.tar.bz2
Merge 3.5 (asyncio)
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/asyncio-eventloop.rst13
1 files changed, 10 insertions, 3 deletions
diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
index 889c8e2..0792a83 100644
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -333,9 +333,12 @@ Creating listening connections
Parameters:
- * If *host* is an empty string or ``None``, all interfaces are assumed
- and a list of multiple sockets will be returned (most likely
- one for IPv4 and another one for IPv6).
+ * The *host* parameter can be a string, in that case the TCP server is
+ bound to *host* and *port*. The *host* parameter can also be a sequence
+ of strings and in that case the TCP server is bound to all hosts of the
+ sequence. If *host* is an empty string or ``None``, all interfaces are
+ assumed and a list of multiple sockets will be returned (most likely one
+ for IPv4 and another one for IPv6).
* *family* can be set to either :data:`socket.AF_INET` or
:data:`~socket.AF_INET6` to force the socket to use IPv4 or IPv6. If not set
@@ -369,6 +372,10 @@ Creating listening connections
The function :func:`start_server` creates a (:class:`StreamReader`,
:class:`StreamWriter`) pair and calls back a function with this pair.
+ .. versionchanged:: 3.5.1
+
+ The *host* parameter can now be a sequence of strings.
+
.. coroutinemethod:: BaseEventLoop.create_unix_server(protocol_factory, path=None, \*, sock=None, backlog=100, ssl=None)