summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-04-24 22:07:51 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-04-24 22:07:51 (GMT)
commitc2203f92ff05840873d68ae6369a302c7db4948e (patch)
tree14c9b197c7a6ea3c88e8c153440f2aa802dc3029 /Misc
parentec146185c4382206ecbbcaa505c81b8c04992f3a (diff)
downloadcpython-c2203f92ff05840873d68ae6369a302c7db4948e.zip
cpython-c2203f92ff05840873d68ae6369a302c7db4948e.tar.gz
cpython-c2203f92ff05840873d68ae6369a302c7db4948e.tar.bz2
Merged revisions 80456 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r80456 | antoine.pitrou | 2010-04-25 00:04:40 +0200 (dim., 25 avril 2010) | 5 lines Issue #8524: When creating an SSL socket, the timeout value of the original socket wasn't retained (instead, a socket with a positive timeout would be turned into a non-blocking SSL socket). ........
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS4
1 files changed, 4 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index df89d37..dd02c3d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -40,6 +40,10 @@ Core and Builtins
Library
-------
+- Issue #8524: When creating an SSL socket, the timeout value of the
+ original socket wasn't retained (instead, a socket with a positive timeout
+ would be turned into a non-blocking SSL socket).
+
- Issue #5103: SSL handshake would ignore the socket timeout and block
indefinitely if the other end didn't respond.