diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-19 13:20:29 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-19 13:20:29 +0100 |
| commit | 118a76071994343364cc347e9a78c295d09a8bfe (patch) | |
| tree | 10342d1169614792cacdcc2fef45afcd62b29a98 | |
| parent | SYN-383: Actually, we expect this value to be a dict (diff) | |
| parent | Disable GZip encoding on static file resources as per comment (diff) | |
| download | synapse-118a76071994343364cc347e9a78c295d09a8bfe.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
| -rw-r--r-- | scripts-dev/convert_server_keys.py | 5 | ||||
| -rwxr-xr-x | synapse/app/homeserver.py | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/scripts-dev/convert_server_keys.py b/scripts-dev/convert_server_keys.py index 024ddcdbd0..a1ee39059c 100644 --- a/scripts-dev/convert_server_keys.py +++ b/scripts-dev/convert_server_keys.py @@ -47,7 +47,10 @@ def convert_v1_to_v2(server_name, valid_until, keys, certificate): return { "old_verify_keys": {}, "server_name": server_name, - "verify_keys": keys, + "verify_keys": { + key_id: {"key": key} + for key_id, key in keys.items() + }, "valid_until_ts": valid_until, "tls_fingerprints": [fingerprint(certificate)], } diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 2e11ac062f..fa43211415 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -85,10 +85,10 @@ class SynapseHomeServer(HomeServer): return MatrixFederationHttpClient(self) def build_resource_for_client(self): - return ClientV1RestResource(self) + return gz_wrap(ClientV1RestResource(self)) def build_resource_for_client_v2_alpha(self): - return ClientV2AlphaRestResource(self) + return gz_wrap(ClientV2AlphaRestResource(self)) def build_resource_for_federation(self): return JsonResource(self) @@ -97,6 +97,12 @@ class SynapseHomeServer(HomeServer): import syweb syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") + # GZip is disabled here due to + # https://twistedmatrix.com/trac/ticket/7678 + # (It can stay enabled for the API resources: they call + # write() with the whole body and then finish() straight + # after and so do not trigger the bug. + # return GzipFile(webclient_path) # TODO configurable? return File(webclient_path) # TODO configurable? def build_resource_for_static_content(self): |