changeset:   104951:573bc1f9900e
parent:      104948:62b7614970bd
parent:      104950:6811df9e9797
user:        Yury Selivanov <yury@magic.io>
date:        Mon Nov 07 15:36:03 2016 -0500
description:
Merge 3.6 (issue #27392)


diff -r 62b7614970bd -r 573bc1f9900e Doc/library/asyncio-eventloop.rst
--- a/Doc/library/asyncio-eventloop.rst	Mon Nov 07 23:37:12 2016 +0300
+++ b/Doc/library/asyncio-eventloop.rst	Mon Nov 07 15:36:03 2016 -0500
@@ -462,6 +462,23 @@
 
    Availability: UNIX.
 
+.. coroutinemethod:: BaseEventLoop.connect_accepted_socket(protocol_factory, sock, \*, ssl=None)
+
+   Handle an accepted connection.
+
+   This is used by servers that accept connections outside of
+   asyncio but that use asyncio to handle them.
+
+   Parameters:
+
+   * *sock* is a preexisting socket object returned from an ``accept``
+     call.
+
+   * *ssl* can be set to an :class:`~ssl.SSLContext` to enable SSL over the
+     accepted connections.
+
+   This method is a :ref:`coroutine <coroutine>`.  When completed, the
+   coroutine returns a ``(transport, protocol)`` pair.
 
 Watch file descriptors
 ----------------------