diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-11-02 11:29:25 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-11-02 11:29:25 +0000 |
| commit | b1c27975d06ff23481a8b1ae0b384a9b5dedd04e (patch) | |
| tree | 170d1f2d10048bd07ec371e67b323ec21e698634 /synapse/rest/media/v1/thumbnail_resource.py | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-b1c27975d06ff23481a8b1ae0b384a9b5dedd04e.tar.xz | |
Set CORs headers on responses from the media repo
Diffstat (limited to 'synapse/rest/media/v1/thumbnail_resource.py')
| -rw-r--r-- | synapse/rest/media/v1/thumbnail_resource.py | 3 |
1 files changed, 2 insertions, 1 deletions
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") |