Changeset 1413

Timestamp:

10/26/06 00:06:16

Author:

fumanchu

Message:

Fix for #573 (wsgi server bug in mount-point resolution with multiple mounted applications).

Files:

• trunk/cherrypy/_cpwsgiserver.py (modified) (1 diff)
• trunk/cherrypy/test/test_objectmapping.py (modified) (3 diffs)

trunk/cherrypy/_cpwsgiserver.py

@@ -111 +111 @@
-            for mount_point, wsgi_app in server.mount_points:
-                # The mount_points list should be sorted by length, descending.
-)
+ + "/") or path == mount_point
-                    self.environ["SCRIPT_NAME"] = mount_point
-                    self.environ["PATH_INFO"] = path[len(mount_point):]

trunk/cherrypy/test/test_objectmapping.py

@@ -5 +5 @@
-
-
-
+foo", "/
-
-def setup_server():
@@ -12 +12 @@
-            return name
-        index.exposed = True
+        
+        def foobar(self):
+            return "bar"
+        foobar.exposed = True
-        
-        def default(self, *params):
@@ -235 +239 @@
-        self.getPage("/isolated/doesnt/exist")
-        self.assertStatus("404 Not Found")
+        
+        # Make sure /foobar maps to Root.foobar and not to the app
+        # mounted at /foo. See http://www.cherrypy.org/ticket/573
+        self.getPage("/foobar")
+        self.assertBody("bar")
-    
-    def testPositionalParams(self):