Commit e995af01 authored by Denis Bilenko's avatar Denis Bilenko

ssl: remove unnecessary stuff from recv() method to match the standard ssl behavior

parent 2be815a1
...@@ -221,23 +221,8 @@ class SSLSocket(socket): ...@@ -221,23 +221,8 @@ class SSLSocket(socket):
raise ValueError( raise ValueError(
"non-zero flags not allowed in calls to recv() on %s" % "non-zero flags not allowed in calls to recv() on %s" %
self.__class__) self.__class__)
while True: # QQQ Shouldn't we wrap the SSL_WANT_READ errors as socket.timeout errors to match socket.recv's behavior?
try:
return self.read(buflen) return self.read(buflen)
except SSLError, x:
if x.args[0] == SSL_ERROR_WANT_READ:
sys.exc_clear()
if self.timeout == 0.0:
raise timeout(str(x))
try:
wait_read(self.fileno(), timeout=self.timeout, event=self._read_event)
except socket_error, ex:
if ex[0] == EBADF:
return ''
raise
continue
else:
raise
else: else:
return socket.recv(self, buflen, flags) return socket.recv(self, buflen, flags)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment