diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-23 21:07:58 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-23 21:07:58 (GMT) |
| commit | 07072168fb939e594e47d90a4af938cc46eb6217 (patch) | |
| tree | f5373cad003079540de0073e51e0e01f73d3e22a /Lib/ssl.py | |
| parent | 160c6aba4b702131b703c80e434e811309f6b2a4 (diff) | |
| download | cpython-07072168fb939e594e47d90a4af938cc46eb6217.zip cpython-07072168fb939e594e47d90a4af938cc46eb6217.tar.gz cpython-07072168fb939e594e47d90a4af938cc46eb6217.tar.bz2 | |
Merged revisions 80392 via svnmerge from
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.
........
Diffstat (limited to 'Lib/ssl.py')
0 files changed, 0 insertions, 0 deletions