summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-06-17 16:22:12 +0100
committerGitHub <noreply@github.com>2016-06-17 16:22:12 +0100
commit9ba2bf1570842de9277ce164e966e47842b097b6 (patch)
treec03969a649f69ac236238daa2cd2d7ed1f16edf4 /synapse/federation
parentMerge pull request #877 from matrix-org/erikj/frozen_default (diff)
parentDisable responding with canonical json for federation (diff)
downloadsynapse-9ba2bf1570842de9277ce164e966e47842b097b6.tar.xz
Merge pull request #878 from matrix-org/erikj/ujson
Disable responding with canonical json for federation
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/transport/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py

index 6fc3e2207c..8a1965f45a 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py
@@ -37,7 +37,7 @@ class TransportLayerServer(JsonResource): self.hs = hs self.clock = hs.get_clock() - super(TransportLayerServer, self).__init__(hs) + super(TransportLayerServer, self).__init__(hs, canonical_json=False) self.authenticator = Authenticator(hs) self.ratelimiter = FederationRateLimiter(