From 287452eeaf0d7f0be6467b49716e76d7c9119cda Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 29 Jul 2015 01:39:13 +0200
Subject: [PATCH] What's New in Python 3.5: Document ssl methods change on
 timeout

---
 Doc/whatsnew/3.5.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
index 8dee183f94a..cc100f2eb7e 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
 ------