Merged revisions 79226,79286 via svnmerge from
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.
........
diff --git a/Lib/ssl.py b/Lib/ssl.py
index b1cc149..e009697 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -240,16 +240,9 @@
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 @@
continue
else:
raise x
+ return self.read(nbytes, buffer)
else:
return socket.recv_into(self, buffer, nbytes, flags)