summaryrefslogtreecommitdiffstats
path: root/Misc/NEWS
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-03-22 14:49:10 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-03-22 14:49:10 (GMT)
commit5733c08f55e9bf1ff5ac79908d941581feafea57 (patch)
treef0f7d64783ed07d6804f63cef4999b9d2d634a4e /Misc/NEWS
parent808fc0a0eea56dd4ef2fa9f9dee00ef0c20760f2 (diff)
downloadcpython-5733c08f55e9bf1ff5ac79908d941581feafea57.zip
cpython-5733c08f55e9bf1ff5ac79908d941581feafea57.tar.gz
cpython-5733c08f55e9bf1ff5ac79908d941581feafea57.tar.bz2
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. ........
Diffstat (limited to 'Misc/NEWS')
-rw-r--r--Misc/NEWS2
1 files changed, 2 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 8a62cbf..a27dd11 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -287,6 +287,8 @@ C-API
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.