Merge 3.5 (doc)

This commit is contained in:
Victor Stinner 2015-07-29 01:39:30 +02:00
commit 5019d55b52
1 changed files with 9 additions and 0 deletions

View File

@ -750,6 +750,15 @@ sndhdr
:func:`~collections.namedtuple`.
(Contributed by Claudiu Popa in :issue:`18615`.)
ssl
---
The :meth:`~ssl.SSLSocket.do_handshake`, :meth:`~ssl.SSLSocket.read`,
:meth:`~ssl.SSLSocket.shutdown`, and :meth:`~ssl.SSLSocket.write` methods of
:class:`ssl.SSLSocket` don't reset the socket timeout anymore each time bytes
are received or sent. The socket timeout is now the maximum total duration of
the method.
socket
------