mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merged revisions 79226,79286 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Antoine Pitrou 2010-03-22 14:49:10 +00:00
parent 808fc0a0ee
commit 5733c08f55
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/ssl.py
View file

@ -240,16 +240,9 @@ class SSLSocket(socket):
if self._sslobj:
if flags != 0:
raise ValueError(
"non-zero flags not allowed in calls to recv_into() on %s" %
self.__class__)
while True:
try:
return self.read(buflen)
except SSLError as x:
if x.args[0] == SSL_ERROR_WANT_READ:
continue
else:
raise x
"non-zero flags not allowed in calls to recv() on %s" %
self.__class__)
return self.read(buflen)
else:
return socket.recv(self, buflen, flags)
@ -273,6 +266,7 @@ class SSLSocket(socket):
continue
else:
raise x
return self.read(nbytes, buffer)
else:
return socket.recv_into(self, buffer, nbytes, flags)