diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-08-18 08:49:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-18 08:49:59 -0400 |
| commit | 2f4d60a5ba9ec60ab4f3384cbef20fe662b4349b (patch) | |
| tree | fb145388813f7cc1ab3b59e95ebdf8af423d1eaa /synapse/rest/key | |
| parent | Return the previous stream token if a non-member event is a duplicate. (#8093) (diff) | |
| download | synapse-2f4d60a5ba9ec60ab4f3384cbef20fe662b4349b.tar.xz | |
Iteratively encode JSON responses to avoid blocking the reactor. (#8013)
Diffstat (limited to 'synapse/rest/key')
| -rw-r--r-- | synapse/rest/key/v2/remote_key_resource.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/rest/key/v2/remote_key_resource.py b/synapse/rest/key/v2/remote_key_resource.py index 9b3f85b306..e266204f95 100644 --- a/synapse/rest/key/v2/remote_key_resource.py +++ b/synapse/rest/key/v2/remote_key_resource.py @@ -15,12 +15,12 @@ import logging from typing import Dict, Set -from canonicaljson import encode_canonical_json, json +from canonicaljson import json from signedjson.sign import sign_json from synapse.api.errors import Codes, SynapseError from synapse.crypto.keyring import ServerKeyFetcher -from synapse.http.server import DirectServeJsonResource, respond_with_json_bytes +from synapse.http.server import DirectServeJsonResource, respond_with_json from synapse.http.servlet import parse_integer, parse_json_object_from_request logger = logging.getLogger(__name__) @@ -223,4 +223,4 @@ class RemoteKey(DirectServeJsonResource): results = {"server_keys": signed_keys} - respond_with_json_bytes(request, 200, encode_canonical_json(results)) + respond_with_json(request, 200, results, canonical_json=True) |