Changeset 1481

Timestamp:

12/09/06 12:33:08

Author:

fumanchu

Message:

2.x: Buglet in lib.cptools, plus a backport of serve_download. See [1069], [1084].

Files:

• branches/cherrypy-2.x/cherrypy/lib/cptools.py (modified) (2 diffs)

branches/cherrypy-2.x/cherrypy/lib/cptools.py

@@ -131 +131 @@
-    
-    if not modified_since(path, stat):
+        response.body = []
-        return []
-    
@@ -198 +199 @@
-        response.body = bodyfile
-    return response.body
+serve_file = serveFile
+
+def serve_download(path, name=None):
+    """Serve 'path' as an application/x-download attachment."""
+    # This is such a common idiom I felt it deserved its own wrapper.
+    return serve_file(path, "application/x-download", "attachment", name)
-
-def fileGenerator(input, chunkSize=65536):