diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-06 11:32:36 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-06 11:32:36 +0000 |
| commit | 3c8c3bf3b781068637223d47d542d9d93a05a9b3 (patch) | |
| tree | e33e66b2a4158dfc2fadc2bd1ab52df50ffafa05 /synapse/media/v1/thumbnail_resource.py | |
| parent | spell out that VoIP needs TURN (diff) | |
| download | synapse-3c8c3bf3b781068637223d47d542d9d93a05a9b3.tar.xz | |
SYN-229: Include Content-Length when downloading files
Diffstat (limited to 'synapse/media/v1/thumbnail_resource.py')
| -rw-r--r-- | synapse/media/v1/thumbnail_resource.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/media/v1/thumbnail_resource.py b/synapse/media/v1/thumbnail_resource.py index 5ddcf54b9f..666764203c 100644 --- a/synapse/media/v1/thumbnail_resource.py +++ b/synapse/media/v1/thumbnail_resource.py @@ -100,11 +100,12 @@ class ThumbnailResource(BaseMediaResource): t_type = thumbnail_info["thumbnail_type"] t_method = thumbnail_info["thumbnail_method"] file_id = thumbnail_info["filesystem_id"] + t_length = thumbnail_info["thumbnail_length"] file_path = self.filepaths.remote_media_thumbnail( server_name, file_id, t_width, t_height, t_type, t_method, ) - yield self._respond_with_file(request, t_type, file_path) + yield self._respond_with_file(request, t_type, file_path, t_length) else: yield self._respond_default_thumbnail( request, media_info, width, height, method, m_type, @@ -139,11 +140,12 @@ class ThumbnailResource(BaseMediaResource): t_height = thumbnail_info["thumbnail_height"] t_type = thumbnail_info["thumbnail_type"] t_method = thumbnail_info["thumbnail_method"] + t_length = thumbnail_info["thumbnail_length"] file_path = self.filepaths.default_thumbnail( top_level_type, sub_type, t_width, t_height, t_type, t_method, ) - yield self.respond_with_file(request, t_type, file_path) + yield self.respond_with_file(request, t_type, file_path, t_length) def _select_thumbnail(self, desired_width, desired_height, desired_method, desired_type, thumbnail_infos): |