Ticket #2131: http-response-send-file.diff

django/http/__init__.py

@@ -238 +238 @@
             raise Exception, "This %s instance cannot tell its position" % self.__class__
         return sum([len(chunk) for chunk in self._iterator])
 
+class HttpResponseSendFile(HttpResponse):
+    def __init__(self, path_to_file, content_type=None):
+        HttpResponse.__init__(self)
+        if not content_type:
+            from mimetime import guess_type
+            content_type = guess_type(path_to_file)
+        self['Content-Type'] = content_type
+        self.sendfile_filename = path_to_file
+        self.block_size = 8192
+        self.status_code = 200
+
 class HttpResponseRedirect(HttpResponse):
     def __init__(self, redirect_to):
         HttpResponse.__init__(self)

django/core/servers/basehttp.py

@@ -307 +307 @@
         in the event loop to iterate over the data, and to call
         'self.close()' once the response is finished.
         """
-        if not self.result_is_file() and not self.sendfile():
-            for data in self.result:
-                self.write(data)
-            self.finish_content()
+        for data in self.result:
+            self.write(data)
+        self.finish_content()
         self.close()
 
     def get_scheme(self):

django/core/handlers/wsgi.py

@@ -160 +160 @@
         for c in response.cookies.values():
             response_headers.append(('Set-Cookie', c.output(header='')))
         start_response(status, response_headers)
+        if hasattr(response, 'sendfile_filename'):
+            filelike = open(response.sendfile_filename, 'rb')
+            block_size = response.block_size
+            if 'wsgi.file_wrapper' in environ:
+                return environ['wsgi.file_wrapper'](filelike, block_size)
+            else:
+                return iter(lambda: filelike.read(block_size), '')
         return response.iterator

django/core/handlers/modpython.py

@@ -143 +143 @@
     "Populates the mod_python request object with an HttpResponse"
     from django.conf import settings
     mod_python_req.content_type = http_response['Content-Type']
+    if hasattr(http_response, 'sendfile_filename'):
+        mod_python_req.sendfile(http_response.sendfile_filename)
+        return
     for key, value in http_response.headers.items():
         if key != 'Content-Type':
             mod_python_req.headers_out[key] = value