Changeset 8:32111cd994e9

Timestamp:

04/16/05 02:45:05 (3 years ago)

Author:

Allan Saddi <allan@saddi.com>

branch:

default

convert_revision:

svn:46762da8-4eb7-0310-94e9-d918b60927c8/flup/trunk@1764

Message:

mod_scgi doesn't pass in PATH_INFO. Deduce from SCRIPT_NAME.

Files:

• flup/server/scgi_base.py (modified) (4 diffs)

flup/server/scgi_base.py

@@ -268 +268 @@
-    requestClass = Request
-
-
+scriptName='', 
-                 multithreaded=True,
-                 bindAddress=('localhost', 4000), allowedServers=None,
-                 loggingLevel=logging.INFO):
-        """
+        scriptName is the initial portion of the URL path that "belongs"
+        to your application. It is used to determine PATH_INFO (which doesn't
+        seem to be passed in). An empty scriptName means your application
+        is mounted at the root of your virtual host.
+
-        environ, which must be a dictionary, can contain any additional
-        environment variables you want to pass to your application.
@@ -293 +298 @@
-
-        self.application = application
+        self.scriptName = scriptName
-        self.environ = environ
-        self.multithreaded = multithreaded
@@ -345 +351 @@
-        else:
-            environ['wsgi.url_scheme'] = 'http'
+
+        self._sanitizeEnv(environ)
-
-        headers_set = []
@@ -426 +434 @@
-                self._appLock.release()
-
+    def _sanitizeEnv(self, environ):
+        """Fill-in/deduce missing values in environ."""
+        # Namely SCRIPT_NAME/PATH_INFO
+        value = environ['SCRIPT_NAME']
+        scriptName = self.scriptName
+        if not value.startswith(scriptName):
+            self.logger.warning('scriptName does not match request URI')
+
+        environ['PATH_INFO'] = value[len(scriptName):]
+        environ['SCRIPT_NAME'] = scriptName
+
-    def error(self, request):
-        """