Changeset 66b76d in indico

Timestamp:

04/08/11 15:15:01 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

79bea23

Parents:

0b9955f

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (04/08/11 15:14:15)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (04/08/11 15:15:01)

Message:

[IMP] Use X-Send-File for all files

• Attachments included;

Location:

indico

Files:

• MaKaC/webinterface/rh/fileAccess.py (modified) (1 diff)
• web/wsgi/indico_wsgi_file_handler.py (modified) (1 diff)
• web/wsgi/indico_wsgi_handler.py (modified) (1 diff)

indico/MaKaC/webinterface/rh/fileAccess.py

@@ -70 +70 @@
                 pass
             self._req.headers_out["Content-Disposition"] = '%s; filename="%s"' % (dispos, self._file.getFileName())
-            return self._file.readBin()
+
+            if cfg.getUseXSendFile():
+                # X-Send-File support makes it easier, just let the web server
+                # do all the heavy lifting
+                return self._req.send_x_file(self._file.getFilePath())
+            else:
+                return self._file.readBin()
         else:
             p = files.WPMinutesDisplay(self, self._file )

indico/web/wsgi/indico_wsgi_file_handler.py

@@ -196 +196 @@
         return ret
 
-
     if Config.getInstance().getUseXSendFile():
-
         ## If XSendFile is supported by the server, let's use it.
         if os.path.exists(fullpath):
-
-            if fullname is None:
-                fullname = os.path.basename(fullpath)
-            req.headers_out["Content-Disposition"] = 'inline; filename="%s"' % fullname.replace('"', '\\"')
-            req.headers_out["X-Sendfile"] = fullpath
-            if mime is None:
-                (mime, encoding) = _mimes.guess_type(fullpath)
-                if mime is None:
-                    mime = "application/octet-stream"
-            req.content_type = mime
-
-            return ""
+            return req.send_x_file(fullpath, fullname, mime)
         else:
             raise apache.SERVER_RETURN, apache.HTTP_NOT_FOUND
+
+    # otherwise, send file the "traditional" way
 
     headers = get_normalized_headers(req.headers_in)

indico/web/wsgi/indico_wsgi_handler.py

@@ -460 +460 @@
         return self.__bytes_sent
 
+    def send_x_file(self, fullpath, fullname=None, mime=None):
+        """
+        Sends a file using X-Send-File
+        """
+        if fullname is None:
+            fullname = os.path.basename(fullpath)
+        self.headers_out["Content-Disposition"] = 'inline; filename="%s"' % fullname.replace('"', '\\"')
+        self.headers_out["X-Sendfile"] = fullpath
+
+        if mime is None:
+            from indico.web.wsgi.indico_wsgi_file_handler import _mimes
+            (mime, encoding) = _mimes.guess_type(fullpath)
+            if mime is None:
+                mime = "application/octet-stream"
+        self.content_type = mime
+
+        return ""
+
     def set_content_length(self, content_length):
         if content_length is not None: