Changeset 878

Timestamp:

12/19/05 20:03:58

Author:

peterhunt

Message:

fix which now allows us to serve static content directly alongside dynamic content. staticFilter won't take over the entire request if it doesn't find the file

Files:

• trunk/cherrypy/filters/staticfilter.py (modified) (1 diff)

trunk/cherrypy/filters/staticfilter.py

@@ -41 +41 @@
-            if root:
-                filename = os.path.join(root, filename)
+
+        try:        
+            cptools.serveFile(filename)
+            request.executeMain = False
+        except cherrypy.NotFound:
+            # if we didn't find the static file, continue
+            # handling the request. we might find a dynamic
+            # handler instead.
+            pass
-        
-        cptools.serveFile(filename)
-        request.executeMain = False
-