Merge with 3.4

This commit is contained in:
Victor Stinner 2014-07-12 03:20:40 +02:00
commit e8567106c0
1 changed files with 5 additions and 2 deletions

View File

@ -567,8 +567,11 @@ Server
.. method:: close()
Stop serving: close all sockets and set the :attr:`sockets` attribute to
``None``.
Stop serving: close listening sockets and set the :attr:`sockets`
attribute to ``None``.
The sockets that represent existing incoming client connections are
leaved open.
The server is closed asynchonously, use the :meth:`wait_closed` coroutine
to wait until the server is closed.