diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-24 21:30:20 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-24 21:30:20 (GMT) |
| commit | ec146185c4382206ecbbcaa505c81b8c04992f3a (patch) | |
| tree | a92f2f92c4ef19ad0adf8f558b0f9c43b027a740 /Misc | |
| parent | 44bb1f7eabd850db1e03574debbba8e40d897e1c (diff) | |
| download | cpython-ec146185c4382206ecbbcaa505c81b8c04992f3a.zip cpython-ec146185c4382206ecbbcaa505c81b8c04992f3a.tar.gz cpython-ec146185c4382206ecbbcaa505c81b8c04992f3a.tar.bz2 | |
Merged revisions 80454 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r80454 | antoine.pitrou | 2010-04-24 23:26:44 +0200 (sam., 24 avril 2010) | 15 lines
Merged revisions 80451-80452 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80451 | antoine.pitrou | 2010-04-24 21:57:01 +0200 (sam., 24 avril 2010) | 4 lines
The do_handshake() method of SSL objects now adjusts the blocking mode of
the SSL structure if necessary (as other methods already do).
........
r80452 | antoine.pitrou | 2010-04-24 22:04:58 +0200 (sam., 24 avril 2010) | 4 lines
Issue #5103: SSL handshake would ignore the socket timeout and block
indefinitely if the other end didn't respond.
........
................
Diffstat (limited to 'Misc')
| -rw-r--r-- | Misc/NEWS | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -40,6 +40,12 @@ Core and Builtins Library ------- +- Issue #5103: SSL handshake would ignore the socket timeout and block + indefinitely if the other end didn't respond. + +- The do_handshake() method of SSL objects now adjusts the blocking mode of + the SSL structure if necessary (as other methods already do). + - 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 |