]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 26 Jan 2015 00:46:29 +0000 (01:46 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 26 Jan 2015 00:46:29 +0000 (01:46 +0100)
Conflicts:
telemeta/views/item.py

1  2 
telemeta/views/item.py

index 0daabfa34509ecab62673154b1727716095f3fc8,598410e671afdcb1541b799253f03b5ef83d1756..e357019fe1dad0f8e9b68f322c410ef7bd7c1e8e
@@@ -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