]> granicus.if.org Git - python/commit
Merged revisions 79226,79286 via svnmerge from
authorAntoine Pitrou <solipsis@pitrou.net>
Mon, 22 Mar 2010 14:49:10 +0000 (14:49 +0000)
committerAntoine Pitrou <solipsis@pitrou.net>
Mon, 22 Mar 2010 14:49:10 +0000 (14:49 +0000)
commit5733c08f55e9bf1ff5ac79908d941581feafea57
treef0f7d64783ed07d6804f63cef4999b9d2d634a4e
parent808fc0a0eea56dd4ef2fa9f9dee00ef0c20760f2
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.
........
Lib/ssl.py
Lib/test/test_ftplib.py
Misc/NEWS