Ticket #7894: file_wrapper_response.diff

django/http/__init__.py

@@ -424 +424 @@
     def __init__(self, *args, **kwargs):
         HttpResponse.__init__(self, *args, **kwargs)
 
+class HttpResponseFileWrapper(HttpResponse):
+    def __init__(self, filelike, block_size=8192, **kwargs):
+        default_reader = iter(lambda: filelike.read(block_size), '')
+        HttpResponse.__init__(self, content=default_reader, **kwargs)
+        self.filelike = filelike
+        self.block_size = block_size
+
 # A backwards compatible alias for HttpRequest.get_host.
 def get_host(request):
     return request.get_host()

django/core/servers/basehttp.py

@@ -312 +312 @@
         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():
+        if not self.result_is_file() or not self.sendfile():
             for data in self.result:
                 self.write(data)
             self.finish_content()

django/core/handlers/wsgi.py

@@ -232 +232 @@
         for c in response.cookies.values():
             response_headers.append(('Set-Cookie', str(c.output(header=''))))
         start_response(status, response_headers)
-        return response
+        if (isinstance(response, http.HttpResponseFileWrapper) and
+            'wsgi.file_wrapper'in environ):
+            return environ['wsgi.file_wrapper'](response.filelike, response.block_size)
+        else:
+            return response