Changeset 896

Timestamp:

12/29/05 17:03:46

Author:

fumanchu

Message:

Fix for #404, #417 (index files and staticfilter). New "static_filter.index" config entry.

Files:

• trunk/cherrypy/filters/staticfilter.py (modified) (2 diffs)
• trunk/cherrypy/lib/cptools.py (modified) (1 diff)
• trunk/cherrypy/test/test_static_filter.py (modified) (3 diffs)

trunk/cherrypy/filters/staticfilter.py

@@ -34 +34 @@
-            extraPath = extraPath.lstrip(r"\/")
-            extraPath = urllib.unquote(extraPath)
+            # If extraPath is "", filename will end in a slash
-            filename = os.path.join(staticDir, extraPath)
-        
-        # If filename is relative, make absolute using "root".
+        # Note that, if "root" isn't defined, we still may send
+        # a relative path to serveFile.
-        if not os.path.isabs(filename):
-            root = config.get('static_filter.root', '').rstrip(r"\/")
@@ -46 +49 @@
-            request.execute_main = False
-        except cherrypy.NotFound:
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-

trunk/cherrypy/lib/cptools.py

@@ -93 +93 @@
-        if cherrypy.config.get('server.log_file_not_found', False):
-            cherrypy.log("    NOT FOUND file: %s" % path, "DEBUG")
+        raise cherrypy.NotFound()
+    
+    if os.path.isdir(path):
+        # Let the caller deal with it as they like.
-        raise cherrypy.NotFound()
-    

trunk/cherrypy/test/test_static_filter.py

@@ -2 +2 @@
-test.prefer_parent_path()
-
+import os
+curdir = os.path.join(os.getcwd(), os.path.dirname(__file__))
+
-import cherrypy
-import o
+from cherrypy.lib import cptool
-
-
-
+
+
-
-class Static:
+    
+    def index(self):
+        return 'You want the Baron? You can have the Baron!'
+    index.exposed = True
-    
-    def dynamic(self):
@@ -34 +42 @@
-    '/docroot': {
-        'static_filter.on': True,
-os.path.join(os.getcwd(), os.path.dirname(__file__))
+curdir
-        'static_filter.dir': 'static',
+        'static_filter.index': 'index.html',
-    },
-})
@@ -71 +80 @@
-        self.assertMatchesBody('^Dummy stylesheet')
-        
-        # Check a directory (should currently fail--no provision for it)
-        ignore = helper.webtest.ignored_exceptions
-        ignore.append(IOError)
-        try:
-            self.getPage("/static/")
-            self.assertErrorPage(500)
-        finally:
-            ignore.pop()
-        
-        # Test that NotFound will then try dynamic handlers (see [878]).
-        self.getPage("/static/dynamic")
-        self.assertBody("This is a DYNAMIC page")
+        
+        # Check a directory via fall-through to dynamic handler.
+        self.getPage("/static/")
+        self.assertStatus('200 OK')
+        self.assertHeader('Content-Type', 'text/html')
+        self.assertBody('You want the Baron? You can have the Baron!')
+        
+        # Check a directory via "static_filter.index".
+        self.getPage("/docroot/")
+        self.assertStatus('200 OK')
+        self.assertHeader('Content-Type', 'text/html')
+        self.assertBody('Hello, world\r\n')
+        # The same page should be returned even if redirected.
+        self.getPage("/docroot")
+        self.assertStatus('200 OK')
+        self.assertHeader('Content-Type', 'text/html')
+        self.assertBody('Hello, world\r\n')
-
-