summary refs log tree commit diff
path: root/synapse/federation/transport/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-06-20 14:13:54 +0100
committerErik Johnston <erik@matrix.org>2016-06-20 14:13:54 +0100
commit00c281f6a481671c8c37b17aa4ec7216bc551b27 (patch)
tree95d3dceb57e2edf136192ad32f7a7ccadbdbbeb1 /synapse/federation/transport/server.py
parentUpdate change log (diff)
parentMerge pull request #880 from matrix-org/markjh/registered_user (diff)
downloadsynapse-00c281f6a481671c8c37b17aa4ec7216bc551b27.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.1
Diffstat (limited to 'synapse/federation/transport/server.py')
-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(