diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-29 12:17:33 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-29 12:17:33 +0100 |
| commit | a7b65bdedf512f646a3ca2478fb96a914856de35 (patch) | |
| tree | 8b0336ae751d081a21b32c16f1cdb5d93f43e2fb /synapse/rest | |
| parent | SYN-395: Fix CAPTCHA, don't double decode json (diff) | |
| download | synapse-a7b65bdedf512f646a3ca2478fb96a914856de35.tar.xz | |
Add config option to turn off freezing events. Use new encode_json api and ujson.loads
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v1/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/__init__.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/__init__.py b/synapse/rest/client/v1/__init__.py index 21876b3487..cc9b49d539 100644 --- a/synapse/rest/client/v1/__init__.py +++ b/synapse/rest/client/v1/__init__.py @@ -25,7 +25,7 @@ class ClientV1RestResource(JsonResource): """A resource for version 1 of the matrix client API.""" def __init__(self, hs): - JsonResource.__init__(self, hs) + JsonResource.__init__(self, hs, canonical_json=False) self.register_servlets(self, hs) @staticmethod diff --git a/synapse/rest/client/v2_alpha/__init__.py b/synapse/rest/client/v2_alpha/__init__.py index 28d95b2729..7d1aff4307 100644 --- a/synapse/rest/client/v2_alpha/__init__.py +++ b/synapse/rest/client/v2_alpha/__init__.py @@ -28,7 +28,7 @@ class ClientV2AlphaRestResource(JsonResource): """A resource for version 2 alpha of the matrix client API.""" def __init__(self, hs): - JsonResource.__init__(self, hs) + JsonResource.__init__(self, hs, canonical_json=False) self.register_servlets(self, hs) @staticmethod |