From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 21 Mar 2010 19:33:38 +0000 (+0000)
Subject: Issue #3890: Fix recv() and recv_into() on non-blocking SSL sockets.
X-Git-Tag: v2.7b1~274
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=448da71807603770a8033e51b65f6f212fb3e2e4;p=python

Issue #3890: Fix recv() and recv_into() on non-blocking SSL sockets.
---

diff --git a/Lib/ssl.py b/Lib/ssl.py
index 0cb79f33ba..21664b94cd 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -210,16 +210,9 @@ class SSLSocket(socket):
         if self._sslobj:
             if flags != 0:
                 raise ValueError(
-                    "non-zero flags not allowed in calls to sendall() on %s" %
+                    "non-zero flags not allowed in calls to recv() on %s" %
                     self.__class__)
-            while True:
-                try:
-                    return self.read(buflen)
-                except SSLError, x:
-                    if x.args[0] == SSL_ERROR_WANT_READ:
-                        continue
-                    else:
-                        raise x
+            return self.read(buflen)
         else:
             return socket.recv(self, buflen, flags)
 
@@ -233,17 +226,10 @@ class SSLSocket(socket):
                 raise ValueError(
                   "non-zero flags not allowed in calls to recv_into() on %s" %
                   self.__class__)
-            while True:
-                try:
-                    tmp_buffer = self.read(nbytes)
-                    v = len(tmp_buffer)
-                    buffer[:v] = tmp_buffer
-                    return v
-                except SSLError as x:
-                    if x.args[0] == SSL_ERROR_WANT_READ:
-                        continue
-                    else:
-                        raise x
+            tmp_buffer = self.read(nbytes)
+            v = len(tmp_buffer)
+            buffer[:v] = tmp_buffer
+            return v
         else:
             return socket.recv_into(self, buffer, nbytes, flags)
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 48fe18d272..895c753842 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -24,6 +24,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #3890: Fix recv() and recv_into() on non-blocking SSL sockets.
+
 - Issue #8179: Fix macpath.realpath() on a non-existing path.
 
 - Issue #8024: Update the Unicode database to 5.2.