diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-11-27 12:15:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 12:15:14 +0000 |
| commit | 7ef22a41a39047a04fadcf9363f86338914cf4b8 (patch) | |
| tree | f6b3e7fa08f560588471e4c6ded99a69a7c5bd34 /synapse | |
| parent | Merge pull request #2705 from matrix-org/rav/improve_tracebacks (diff) | |
| parent | Fix OPTIONS on preview_url (diff) | |
| download | synapse-7ef22a41a39047a04fadcf9363f86338914cf4b8.tar.xz | |
Merge pull request #2707 from matrix-org/rav/fix_urlpreview
Fix OPTIONS on preview_url
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/rest/media/v1/preview_url_resource.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/preview_url_resource.py b/synapse/rest/media/v1/preview_url_resource.py index 723f7043f4..65f86be205 100644 --- a/synapse/rest/media/v1/preview_url_resource.py +++ b/synapse/rest/media/v1/preview_url_resource.py @@ -25,7 +25,8 @@ from synapse.util.stringutils import random_string from synapse.util.caches.expiringcache import ExpiringCache from synapse.http.client import SpiderHttpClient from synapse.http.server import ( - request_handler, respond_with_json_bytes + request_handler, respond_with_json_bytes, + respond_with_json, ) from synapse.util.async import ObservableDeferred from synapse.util.stringutils import is_ascii @@ -78,6 +79,9 @@ class PreviewUrlResource(Resource): self._expire_url_cache_data, 10 * 1000 ) + def render_OPTIONS(self, request): + return respond_with_json(request, 200, {}, send_cors=True) + def render_GET(self, request): self._async_render_GET(request) return NOT_DONE_YET |