diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-07-28 23:39:30 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-07-28 23:39:30 (GMT) |
| commit | 5019d55b526af7e9a239c195637cb0dcda98440f (patch) | |
| tree | 718351ef16d1e9ce01b18cda4204aa26e7768a90 | |
| parent | e036611aabbec1b02955e5aa37b7c8d469c82f69 (diff) | |
| parent | 287452eeaf0d7f0be6467b49716e76d7c9119cda (diff) | |
| download | cpython-5019d55b526af7e9a239c195637cb0dcda98440f.zip cpython-5019d55b526af7e9a239c195637cb0dcda98440f.tar.gz cpython-5019d55b526af7e9a239c195637cb0dcda98440f.tar.bz2 | |
Merge 3.5 (doc)
| -rw-r--r-- | Doc/whatsnew/3.5.rst | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst index 8dee183..cc100f2 100644 --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -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 ------ |