Changeset 754:66180bd88c08 in hatta-dev

Timestamp:

02/10/10 20:41:29 (2 years ago)

Author:

sheep@…

Branch:

default

Message:

make sure the +download and +render wrap the file being served properly, fixes #29

File:

• hatta.py (modified) (2 diffs)

hatta.py

@@ -2887 +2887 @@
 
     def download(self, request, title):
-        """Serve the raw content of a page."""
+        """Serve the raw content of a page directly from disk."""
 
         mime = page_mime(title)
         if mime == 'text/x-wiki':
             mime = 'text/plain'
-        f = self.storage.open_page(title)
+        try:
+            wrap_file = werkzeug.wrap_file
+        except AttributeError:
+            wrap_file = lambda x, y:x
+        f = wrap_file(request.environ, self.storage.open_page(title))
         response = self.response(request, title, f, '/download', mime, size=-1)
+        response.direct_passthrough = True
         return response
 
@@ -2950 +2955 @@
             finally:
                 rm_temp_dir(temp_dir)
-        f = open(cache_file)
+        try:
+            wrap_file = werkzeug.wrap_file
+        except AttributeError:
+            wrap_file = lambda x, y:x
+        f = wrap_file(request.environ, open(cache_file))
         response = self.response(request, title, f, '/render', cache_mime,
                                  size=cache_size)
+        response.direct_passthrough = True
         return response