[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 (doc)

[victor.stinner]

https://hg.python.org/cpython/rev/f81bdca9113d
changeset:   97107:f81bdca9113d
parent:      97105:3de1c5d6a7b8
parent:      97106:b7442c597842
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Wed Jul 29 01:39:30 2015 +0200
summary:
  Merge 3.5 (doc)

files:
  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
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -750,6 +750,15 @@
   :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
 ------
 

-- 
Repository URL: https://hg.python.org/cpython