• Antoine Pitrou's avatar
    Merged revisions 80392 via svnmerge from · 2c4f98b3
    Antoine Pitrou authored
    svn+ssh://pythondev@svn.python.org/python/trunk
    
    ........
      r80392 | antoine.pitrou | 2010-04-23 01:33:02 +0200 (ven., 23 avril 2010) | 9 lines
    
      Issue #8108: Fix the unwrap() method of SSL objects when the socket has
      a non-infinite timeout.  Also make that method friendlier with applications
      wanting to continue using the socket in clear-text mode, by disabling
      OpenSSL's internal readahead.  Thanks to Darryl Miles for guidance.
    
      Issue #8108: test_ftplib's non-blocking SSL server now has proper handling
      of SSL shutdowns.
    ........
    2c4f98b3
test_ftplib.py 24.8 KB