Changeset 1883

Timestamp:

01/27/08 23:25:20

Author:

fumanchu

Message:

Fix for incorrect use of unbound method with SSL send. Needs porting to trunk regardless of the future of this branch.

Files:

• branches/598-sendall/cherrypy/wsgiserver/__init__.py (modified) (3 diffs)

branches/598-sendall/cherrypy/wsgiserver/__init__.py

@@ -41 +41 @@
-
-import base64
+import os
-import Queue
-import os
-import re
-quoted_slash = re.compile("(?i)%2F")
@@ -712 +712 @@
-    readline = _ssl_wrap_method(socket._fileobject.readline, is_reader=True)
-    readlines = _ssl_wrap_method(socket._fileobject.readlines, is_reader=True)
+    
+    def send(self, *args, **kwargs):
+        return self._sock.send(*args, **kwargs)
+    send = _ssl_wrap_method(send)
-
-
@@ -747 +751 @@
-            self.rfile = SSL_fileobject(sock, "r", self.rbufsize)
-            self.rfile.ssl_timeout = timeout
-_ssl_wrap_method(sock.send)
+self.rfile.send
-        else:
-            self.rfile = sock.makefile("rb", self.rbufsize)