Changeset 17:73577e591432

Timestamp:

05/31/05 15:37:04 (3 years ago)

Author:

Allan Saddi <allan@saddi.com>

branch:

default

convert_revision:

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

Message:

Take scriptName from the WSGI_SCRIPT_NAME environment variable
passed from the web server, if present.
Check if scriptName is None, and if so, don't modify SCRIPT_NAME
& PATH_INFO. For better compatibility with cgi2scgi. (scgi_base)

Files:

• ChangeLog (modified) (1 diff)
• flup/server/ajp_base.py (modified) (4 diffs)
• flup/server/scgi_base.py (modified) (1 diff)

ChangeLog

@@ +1 @@
+2005-05-31  Allan Saddi  <asaddi@ganymede.saddi.net>
+
+        * Take scriptName from the WSGI_SCRIPT_NAME environment variable
+          passed from the web server, if present.
+        * Check if scriptName is None, and if so, don't modify SCRIPT_NAME
+          & PATH_INFO. For better compatibility with cgi2scgi. (scgi_base)
+
-2005-05-18  Allan Saddi  <asaddi@ganymede.saddi.net>
-

flup/server/ajp_base.py

@@ -472 +472 @@
-        self._conn = conn
-
-
-
-
+
-        self.input = InputStream(conn)
-
@@ -520 +518 @@
-    def setRequestURI(self, value):
-        self.environ['REQUEST_URI'] = value
-
-        scriptName = self._conn.server.scriptName
-        if not value.startswith(scriptName):
-            self.logger.warning('scriptName does not match request URI')
-
-        self.environ['PATH_INFO'] = value[len(scriptName):]
-
-    def setRemoteAddr(self, value):
@@ -848 +840 @@
-            environ['wsgi.url_scheme'] = 'http'
-
+        self._sanitizeEnv(environ)
+
-        headers_set = []
-        headers_sent = []
@@ -917 +911 @@
-                self._appLock.release()
-
+    def _sanitizeEnv(self, environ):
+        """Fill-in/deduce missing values in environ."""
+        # Namely SCRIPT_NAME/PATH_INFO
+        value = environ['REQUEST_URI']
+        scriptName = environ.get('WSGI_SCRIPT_NAME', 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):
-        """

flup/server/scgi_base.py

@@ -444 +444 @@
-        """Fill-in/deduce missing values in environ."""
-        # Namely SCRIPT_NAME/PATH_INFO
+        scriptName = environ.get('WSGI_SCRIPT_NAME')
+        if scriptName is None:
+            scriptName = self.scriptName
+        elif scriptName.lower() == 'none':
+            scriptName = None
+
+        if scriptName is None:
+            # Do nothing (most likely coming from cgi2scgi)
+            return
+
-        value = environ['SCRIPT_NAME']
-        # Pull PATH_INFO from environ, if it exists. (cgi2scgi actually
-        # passes it in.)
-        value += environ.get('PATH_INFO', '')
-        scriptName = self.scriptName
-        if not value.startswith(scriptName):
-            self.logger.warning('scriptName does not match request URI')