Changeset 950

Timestamp:

01/30/06 22:16:41

Author:

dowski

Message:

Added new cherrypy.request.wsgi_environ attribute that contains a dictionary of the WSGI environment (surprise, surprise). In a non-WSGI setting wsgi_environ has a value of False.

Files:

• trunk/cherrypy/_cphttpserver.py (modified) (1 diff)
• trunk/cherrypy/_cpwsgi.py (modified) (1 diff)

trunk/cherrypy/_cphttpserver.py

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

trunk/cherrypy/_cpwsgi.py

@@ -70 +70 @@
-        request.multithread = environ['wsgi.multithread']
-        request.multiprocess = environ['wsgi.multiprocess']
+        request.wsgi_environ = environ
-        response = request.run(requestLine(environ),
-                               translate_headers(environ),