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

django/core/handlers/modpython.py

@@ -209 +209 @@
 
         # Convert our custom HttpResponse object back into the mod_python req.
         req.content_type = response['Content-Type']
+        if hasattr(http_response, 'sendfile_filename'):
+            mod_python_req.sendfile(http_response.sendfile_filename)
+            return
         for key, value in response.items():
             if key != 'content-type':
                 req.headers_out[str(key)] = str(value)

django/core/handlers/wsgi.py

@@ -250 +250 @@
         except KeyError:
             status_text = 'UNKNOWN STATUS CODE'
         status = '%s %s' % (response.status_code, status_text)
+
+        if hasattr(response, 'sendfile_filename') and response.has_header('Content-Length'):
+            del response['Content-Length']
         response_headers = [(str(k), str(v)) for k, v in response.items()]
         for c in response.cookies.values():
             response_headers.append(('Set-Cookie', str(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
 

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
+
 class HttpResponseRedirect(HttpResponse):
     status_code = 302