From a06bfd87da41d0a8810b3fd911d7b93ebdaa8ded Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Mon, 22 Mar 2010 15:09:31 +0000 Subject: [PATCH] Merged revisions 79287,79289 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r79287 | antoine.pitrou | 2010-03-22 15:49:10 +0100 (lun., 22 mars 2010) | 13 lines 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. ........ ................ r79289 | antoine.pitrou | 2010-03-22 16:07:09 +0100 (lun., 22 mars 2010) | 3 lines Fix a blunder in r79287. This part is, obviously, poorly tested (if at all). ................ --- Lib/ssl.py | 23 ++++------------------- Misc/NEWS | 2 ++ 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/Lib/ssl.py b/Lib/ssl.py index b1cc149d87..ebb11b49c5 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -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) @@ -264,15 +257,7 @@ class SSLSocket(socket): raise ValueError( "non-zero flags not allowed in calls to recv_into() on %s" % self.__class__) - while True: - try: - v = self.read(nbytes, buffer) - return v - except SSLError as x: - if x.args[0] == SSL_ERROR_WANT_READ: - continue - else: - raise x + return self.read(nbytes, buffer) else: return socket.recv_into(self, buffer, nbytes, flags) diff --git a/Misc/NEWS b/Misc/NEWS index 3a9a64186a..1c329dd266 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -17,6 +17,8 @@ Core and Builtins Library ------- +- Issue #3890: Fix recv() and recv_into() on non-blocking SSL sockets. + - Issue #6716/2: Backslash-replace error output in compilall. Build -- 2.40.0