Changeset 959

Timestamp:

02/07/06 11:33:59

Author:

dowski

Message:

1. Removed request.wsgi_environ from _cphttpserver.
2. Added cherrypy.server.wsgi_app attribute to ease wrapping the CP wsgiApp with WSGI middleware.
3. Modified _cpwsgiserver to set SCRIPT_NAME to and to instead put the request path in PATH_INFO. Modified _cpwsgi to deal with this change.
4. Added standalone test for mounting the CP wsgiApp at an alternate SCRIPT_NAME. Not sure how best to integrate it into the test suite.

Files:

• trunk/cherrypy/_cphttpserver.py (modified) (1 diff)
• trunk/cherrypy/_cpserver.py (modified) (3 diffs)
• trunk/cherrypy/_cpwsgi.py (modified) (1 diff)
• trunk/cherrypy/_cpwsgiserver.py (modified) (1 diff)
• trunk/cherrypy/test/standalone_test_alt_script_name.py (added)

trunk/cherrypy/_cphttpserver.py

@@ -81 +81 @@
-            request.multithread = cherrypy.config.get("server.thread_pool") > 1
-            request.multiprocess = False
-            request.wsgi_environ = {}
-            response = request.run(self.raw_requestline, self._headerlist(),
-                                   self.rfile)

trunk/cherrypy/_cpserver.py

@@ -8 +8 @@
-
-import cherrypy
-
+, _cpwsgi
-from cherrypy.lib import autoreload, profiler, cptools
-
@@ -42 +42 @@
-        self.onStartServerList = []
-        self.onStopThreadList = []
-
+
+
+
-    def start(self, init_only = False, server_class = _missing, **kwargs):
-        """Main function. MUST be called from the main thread.
@@ -154 +156 @@
-        
-        # Instantiate the server.
-
+
+
+
+
+
-        
-        # HTTP servers MUST be started in a new thread, so that the

trunk/cherrypy/_cpwsgi.py

@@ -149 +149 @@
-                # We prepare the SizeCheckWrapper for the request body
-                self.rfile.bytes_read = 0
-
+
+
+
-                if path == "*":
-                    path = "global"
-                else:
-                    path = "/" + path
-                mbs = int(cherrypy.config.get('server.max_request_body_size',
-                                              100 * 1024 * 1024, path=path))

trunk/cherrypy/_cpwsgiserver.py

@@ -65 +65 @@
-            qs = ""
-        self.environ["REQUEST_METHOD"] = method
-
-
-
-
-
+
+
-        self.environ["QUERY_STRING"] = qs
-        self.environ["SERVER_PROTOCOL"] = version