Changeset 1679

Timestamp:

06/22/07 09:36:02

Author:

fumanchu

Message:

SSL fix.

Files:

• trunk/cherrypy/wsgiserver/__init__.py (modified) (6 diffs)

trunk/cherrypy/wsgiserver/__init__.py

@@ -130 +130 @@
-    environ: a partial WSGI environ (server and connection entries).
-        The caller MUST set the following entries:
+        * All wsgi.* entries
+        * SERVER_NAME and SERVER_PORT
+        * Any SSL_* entries
+        * Any custom entries like REMOTE_ADDR and REMOTE_PORT
-        * SERVER_SOFTWARE: the value to write in the "Server" response header.
-        * ACTUAL_SERVER_PROTOCOL: the value to write in the Status-Line of
@@ -605 +609 @@
-            self.rfile.ssl_timeout = timeout
-            self.sendall = _ssl_wrap_method(sock.sendall)
-            self.environ["wsgi.url_scheme"] = "https"
-            self.environ["HTTPS"] = "on"
-            sslenv = getattr(server, "ssl_environ", None)
-            if sslenv:
-                self.environ.update(sslenv)
-        else:
-            self.rfile = sock.makefile("rb", self.rbufsize)
@@ -1061 +1060 @@
-        cert = open(self.ssl_certificate).read()
-        cert = crypto.load_certificate(crypto.FILETYPE_PEM, cert)
-
+
+
+
-            # pyOpenSSL doesn't provide access to any of these AFAICT
-##            'SSL_PROTOCOL': 'SSLv2',
@@ -1070 +1071 @@
-        
-        # Server certificate attributes
-elf.s
+
-            'SSL_SERVER_M_VERSION': cert.get_version(),
-            'SSL_SERVER_M_SERIAL': cert.get_serial_number(),
@@ -1085 +1086 @@
-            
-            wsgikey = 'SSL_SERVER_%s_DN' % prefix
-elf.s
+
-            
-            # The DN should be of the form: /k1=v1/k2=v2, but we must allow
@@ -1096 +1097 @@
-                if key and value:
-                    wsgikey = 'SSL_SERVER_%s_DN_%s' % (prefix, key)
-
-
-
+
+
+
+