Commits

David Andrzejewski committed 4c694fa

Modified SSL_fileobject.recv() to ensure it never returns more bytes than it's been asked for. This should resolve issue #1068.

  • Participants
  • Parent commits 7cac23d

Comments (0)

Files changed (1)

File cherrypy/wsgiserver/ssl_pyopenssl.py

             p = self._sock.pending()
             if not p:
                 return "".join(buf)
+            elif len("".join(buf)) + p >= args[0]:
+                return "".join(buf)
 
     def sendall(self, *args, **kwargs):
         return self._safe_call(False, super(SSL_fileobject, self).sendall,