Ticket #2131: django-ticket-2131-http-response-send-file.2-django1.0.2final-v1.2_test.diff

django/core/servers/basehttp.py

@@ -313 +313 @@
         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/http/__init__.py

@@ -393 +393 @@
             raise Exception("This %s instance cannot tell its position" % self.__class__)
         return sum([len(chunk) for chunk in self._container])
 
+class HttpResponseSendFile(HttpResponse):
+    def __init__(self, path_to_file, content_type=None):
+        HttpResponse.__init__(self)
+        if not content_type:
+            from mimetypes import guess_type
+            content_type = guess_type(path_to_file)[0]
+            if content_type == None: # probably windows w/o proper mimetype lookup
+                content_type = "application/octet-stream"
+        self['Content-Type'] = content_type
+        self.sendfile_filename = path_to_file
+        self.block_size = 8192
+        self.status_code = 200
+        # compatibility; fake being a regular HttpResponse if needed
+        self['Content-Length'] = os.path.getsize(path_to_file)
+        self._container = open(path_to_file)
+        self._is_string = False
+
 class HttpResponseRedirect(HttpResponse):
     status_code = 302