diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-03 15:44:50 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-03 15:44:50 +0000 |
| commit | f594c8a2c36785c3fee5b113c97143745d1b44be (patch) | |
| tree | c471022f8b1312f481c3f08bcd01a4a2edd374ac /synapse/rest | |
| parent | Add some comments (diff) | |
| parent | Merge pull request #1192 from matrix-org/erikj/postgres_gist (diff) | |
| download | synapse-f594c8a2c36785c3fee5b113c97143745d1b44be.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/new_profile github/erikj/new_profile erikj/new_profile
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/media/v1/download_resource.py | 3 | ||||
| -rw-r--r-- | synapse/rest/media/v1/thumbnail_resource.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/synapse/rest/media/v1/download_resource.py b/synapse/rest/media/v1/download_resource.py index a45ee9483e..dfb87ffd15 100644 --- a/synapse/rest/media/v1/download_resource.py +++ b/synapse/rest/media/v1/download_resource.py @@ -15,7 +15,7 @@ from ._base import parse_media_id, respond_with_file, respond_404 from twisted.web.resource import Resource -from synapse.http.server import request_handler +from synapse.http.server import request_handler, set_cors_headers from twisted.web.server import NOT_DONE_YET from twisted.internet import defer @@ -45,6 +45,7 @@ class DownloadResource(Resource): @request_handler() @defer.inlineCallbacks def _async_render_GET(self, request): + set_cors_headers(request) request.setHeader( "Content-Security-Policy", "default-src 'none';" diff --git a/synapse/rest/media/v1/thumbnail_resource.py b/synapse/rest/media/v1/thumbnail_resource.py index 0b9e1de1a7..d8f54adc99 100644 --- a/synapse/rest/media/v1/thumbnail_resource.py +++ b/synapse/rest/media/v1/thumbnail_resource.py @@ -17,7 +17,7 @@ from ._base import parse_media_id, respond_404, respond_with_file from twisted.web.resource import Resource from synapse.http.servlet import parse_string, parse_integer -from synapse.http.server import request_handler +from synapse.http.server import request_handler, set_cors_headers from twisted.web.server import NOT_DONE_YET from twisted.internet import defer @@ -48,6 +48,7 @@ class ThumbnailResource(Resource): @request_handler() @defer.inlineCallbacks def _async_render_GET(self, request): + set_cors_headers(request) server_name, media_id, _ = parse_media_id(request) width = parse_integer(request, "width") height = parse_integer(request, "height") |