diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-09-25 12:03:54 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-09-25 12:03:54 +0100 |
commit | a1cd37390f35ff814be2d2e1428af83b852c5d2a (patch) | |
tree | 56617045f76b6ba1c4deb60a2c48e0f3c663f178 /synapse/rest/media/v1/download_resource.py | |
parent | Fix ExpiringCache.__len__ to be accurate (diff) | |
parent | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches (diff) | |
download | synapse-a1cd37390f35ff814be2d2e1428af83b852c5d2a.tar.xz |
Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache
Diffstat (limited to 'synapse/rest/media/v1/download_resource.py')
-rw-r--r-- | synapse/rest/media/v1/download_resource.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/rest/media/v1/download_resource.py b/synapse/rest/media/v1/download_resource.py index ca90964d1d..f911b120b1 100644 --- a/synapse/rest/media/v1/download_resource.py +++ b/synapse/rest/media/v1/download_resource.py @@ -52,6 +52,7 @@ class DownloadResource(Resource): b" script-src 'none';" b" plugin-types application/pdf;" b" style-src 'unsafe-inline';" + b" media-src 'self';" b" object-src 'self';" ) server_name, media_id, name = parse_media_id(request) |