Merged revisions 79226,79286 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79226 | antoine.pitrou | 2010-03-21 20:33:38 +0100 (dim., 21 mars 2010) | 4 lines
Issue #3890: Fix recv() and recv_into() on non-blocking SSL sockets.
........
r79286 | antoine.pitrou | 2010-03-22 15:41:48 +0100 (lun., 22 mars 2010) | 3 lines
Fix an occasional test_ftplib failure, following r79226.
........
diff --git a/Misc/NEWS b/Misc/NEWS
index 8a62cbf..a27dd11 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -287,6 +287,8 @@
Library
-------
+- Issue #3890: Fix recv() and recv_into() on non-blocking SSL sockets.
+
- Issue #4282: Fix the main function of the profile module for a non-ASCII
script, open the file in binary mode and not in text mode with the default
(utf8) encoding.