From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 26 Jan 2015 00:46:29 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.5.1~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=088d3782f4d9b20b2b9ba4c814f0b90a9df44563;p=telemeta.git

Merge branch 'dev'

Conflicts:
	telemeta/views/item.py
---

088d3782f4d9b20b2b9ba4c814f0b90a9df44563
diff --cc telemeta/views/item.py
index 0daabfa3,598410e6..e357019f
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@@ -584,11 -586,11 +586,10 @@@ class ItemView(ItemBaseMixin)
                  if extension in mapping.unavailable_extensions:
                      metadata=None
                  proc.set_metadata(metadata)
--
-                 response = HttpResponse(stream_from_processor(decoder, proc, flag), mimetype=mime_type)
+                 response = StreamingHttpResponse(stream_from_processor(decoder, proc, flag), content_type=mime_type)
              else:
                  # cache > stream
-                 response = HttpResponse(self.cache_export.read_stream_bin(file), mimetype=mime_type)
+                 response = StreamingHttpResponse(self.cache_export.read_stream_bin(file), content_type=mime_type)
  
          response['Content-Disposition'] = 'attachment'
          return response