Changeset 1440

Timestamp:

11/18/06 17:59:28

Author:

fumanchu

Message:

Fix for #601. New SSL entries in WSGI environ (plus test suite fix under ssl).

Files:

• trunk/cherrypy/_cpwsgiserver.py (modified) (5 diffs)
• trunk/cherrypy/test/test_virtualhost.py (modified) (1 diff)

trunk/cherrypy/_cpwsgiserver.py

@@ -22 +22 @@
-try:
-    from OpenSSL import SSL
+    from OpenSSL import crypto
-except ImportError:
-    SSL = None
@@ -435 +436 @@
-        else:
-            # Assume it's an HTTPS socket wrapper
-            self.environ["wsgi.url_scheme"] = "https"
-            self.rfile = SSL_fileobject(sock, "r", self.rbufsize)
-            self.wfile = SSL_fileobject(sock, "w", self.wbufsize)
+            self.environ["wsgi.url_scheme"] = "https"
+            self.environ["HTTPS"] = "on"
+            sslenv = getattr(server, "ssl_environ")
+            if sslenv:
+                self.environ.update(sslenv)
-        
-        self.environ.update({"wsgi.input": self.rfile,
@@ -612 +617 @@
-                if SSL is None:
-                    raise ImportError("You must install pyOpenSSL to use HTTPS.")
+                
-                # See http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/442473
-                ctx = SSL.Context(SSL.SSLv23_METHOD)
@@ -617 +623 @@
-                ctx.use_certificate_file(self.ssl_certificate)
-                self.socket = SSLConnection(ctx, self.socket)
+                self.populate_ssl_environ()
-            self.socket.bind(self.bind_addr)
-        
@@ -759 +766 @@
-                except AssertionError:
-                    pass
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/cherrypy/test/test_virtualhost.py

@@ -80 +80 @@
-        # Test that cherrypy.url uses the browser url, not the virtual url
-        self.getPage("/url", [('Host', 'www.mydom2.com')])
-http://www.mydom2.com/nextpage"
+%s://www.mydom2.com/nextpage" % self.scheme
-
-