diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-24 21:26:44 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-24 21:26:44 (GMT) |
commit | d3f8ab8bd37d942d64773e9043697003b8502049 (patch) | |
tree | ea8850776e86b56cd2f820ed693f00bdde51be6c /Lib/ssl.py | |
parent | fb88636199c12f63d6c8c89f311cdafc91f30d2f (diff) | |
download | cpython-d3f8ab8bd37d942d64773e9043697003b8502049.zip cpython-d3f8ab8bd37d942d64773e9043697003b8502049.tar.gz cpython-d3f8ab8bd37d942d64773e9043697003b8502049.tar.bz2 |
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 'Lib/ssl.py')
0 files changed, 0 insertions, 0 deletions