Changeset 1470

Timestamp:

12/03/06 05:31:25

Author:

fumanchu

Message:

Fix for #614 (VirtualHost? and staticdir tool still don't play well together).

Files:

• trunk/cherrypy/_cpdispatch.py (modified) (1 diff)
• trunk/cherrypy/_cprequest.py (modified) (1 diff)
• trunk/cherrypy/test/test_virtualhost.py (modified) (3 diffs)

trunk/cherrypy/_cpdispatch.py

@@ -350 +350 @@
-            path_info = http.urljoin(prefix, path_info)
-        
-
+
+
+
+
+
+
+
+
+
-    return vhost_dispatch
-

trunk/cherrypy/_cprequest.py

@@ -179 +179 @@
-                  "response": response_namespace,
-                  "error_page": error_page_namespace,
+                  # "tools": See _cptools.Toolbox
-                  }
-    

trunk/cherrypy/test/test_virtualhost.py

@@ -6 +6 @@
-
-import cherrypy
-from cherrypy import _cpdispatch
-
-def setup_server():
@@ -38 +37 @@
-        url.exposed = True
-        
+        # Test static as a handler (section must NOT include vhost prefix)
-        static = cherrypy.tools.staticdir.handler(section='/static', dir=curdir)
-    
-    
-    root = Root()
-    root.mydom2 = VHost("Domain 2")
-    root.mydom3 = VHost("Domain 3")
-
-
-
+
-               'www.mydom3.com': '/mydom3',
-               'www.mydom4.com': '/dom4',
-
-
+
+
+
+
+
+
+
+
+
+
-    
-    cherrypy.config.update({'environment': 'test_suite'})
@@ -87 +92 @@
-    
-    def test_VHost_plus_Static(self):
+        # Test static as a handler
-        self.getPage("/static/style.css", [('Host', 'www.mydom2.com')])
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Type', 'text/css')
+        
+        # Test static in config
+        self.getPage("/static2/dirback.jpg", [('Host', 'www.mydom2.com')])
+        self.assertStatus('200 OK')
+        self.assertHeader('Content-Type', 'image/jpeg')
+        
+        # Test static config with "index" arg
+        self.getPage("/static2/", [('Host', 'www.mydom2.com')])
+        self.assertStatus('200 OK')
+        self.assertBody('Hello, world\r\n')
+        self.getPage("/static2", [('Host', 'www.mydom2.com')])
+        self.assertStatus('200 OK')
+        self.assertBody('Hello, world\r\n')
-
-