Changeset 1241

Timestamp:

08/12/06 03:38:52

Author:

fumanchu

Message:

Fix for #543 (virtualhostfilter.py generates URIs with a double slash).

Files:

• branches/cherrypy-2.x/cherrypy/filters/virtualhostfilter.py (modified) (1 diff)
• branches/cherrypy-2.x/cherrypy/test/test_virtualhost_filter.py (modified) (3 diffs)

branches/cherrypy-2.x/cherrypy/filters/virtualhostfilter.py

@@ -36 +36 @@
-        prefix = cherrypy.config.get("virtual_host_filter." + domain, "")
-        if prefix:
-"/" + 
+
-

branches/cherrypy-2.x/cherrypy/test/test_virtualhost_filter.py

@@ -14 +14 @@
-            return "Under construction"
-        dom4.exposed = True
-
+
-    class VHost:
-        def __init__(self, sitename):
@@ -22 +22 @@
-            return "Welcome to %s" % self.sitename
-        index.exposed = True
-
-
+
+
+
+
+
+
-    cherrypy.root = Root()
-    cherrypy.root.mydom2 = VHost("Domain 2")
@@ -53 +57 @@
-        self.getPage("/", [('Host', 'www.mydom4.com')])
-        self.assertBody('Under construction')
+        
+        # Test sub pages. See http://www.cherrypy.org/ticket/543.
+        self.getPage("/somewhere", [('Host', 'www.mydom2.com')])
+        self.assertBody('Over the Domain 2 rainbow')
+        self.getPage("/somewhere", [('Host', 'www.mydom3.com')])
+        self.assertBody('Over the Domain 3 rainbow')
-
-