summary refs log tree commit diff
path: root/synapse/media/v1/download_resource.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-06 11:32:36 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-06 11:32:36 +0000
commit3c8c3bf3b781068637223d47d542d9d93a05a9b3 (patch)
treee33e66b2a4158dfc2fadc2bd1ab52df50ffafa05 /synapse/media/v1/download_resource.py
parentspell out that VoIP needs TURN (diff)
downloadsynapse-3c8c3bf3b781068637223d47d542d9d93a05a9b3.tar.xz
SYN-229: Include Content-Length when downloading files
Diffstat (limited to 'synapse/media/v1/download_resource.py')
-rw-r--r--synapse/media/v1/download_resource.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/synapse/media/v1/download_resource.py b/synapse/media/v1/download_resource.py
index f3a6804e05..8b5072ebb7 100644
--- a/synapse/media/v1/download_resource.py
+++ b/synapse/media/v1/download_resource.py
@@ -46,23 +46,29 @@ class DownloadResource(BaseMediaResource):
     def _respond_local_file(self, request, media_id):
         media_info = yield self.store.get_local_media(media_id)
         if not media_info:
-            self._respond_404()
+            self._respond_404(request)
             return
 
         media_type = media_info["media_type"]
+        media_length = media_info["media_length"]
         file_path = self.filepaths.local_media_filepath(media_id)
 
-        yield self._respond_with_file(request, media_type, file_path)
+        yield self._respond_with_file(
+            request, media_type, file_path, media_length
+        )
 
     @defer.inlineCallbacks
     def _respond_remote_file(self, request, server_name, media_id):
         media_info = yield self._get_remote_media(server_name, media_id)
 
         media_type = media_info["media_type"]
+        media_length = media_info["media_length"]
         filesystem_id = media_info["filesystem_id"]
 
         file_path = self.filepaths.remote_media_filepath(
             server_name, filesystem_id
         )
 
-        yield self._respond_with_file(request, media_type, file_path)
+        yield self._respond_with_file(
+            request, media_type, file_path, media_length
+        )