summary refs log tree commit diff
path: root/synapse/federation/transport
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-06-17 16:43:45 +0100
committerErik Johnston <erik@matrix.org>2016-06-17 16:43:45 +0100
commit8f4a9bbc16e6b54f1ab110085e42884fd16abb6a (patch)
treed002608685ff5f081347eb74ab26dd2fd1b24520 /synapse/federation/transport
parentMerge pull request #878 from matrix-org/erikj/ujson (diff)
downloadsynapse-8f4a9bbc16e6b54f1ab110085e42884fd16abb6a.tar.xz
Linearize some federation endpoints based on (origin, room_id)
Diffstat (limited to 'synapse/federation/transport')
-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 8a1965f45a..26fa88ae84 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py
@@ -388,7 +388,7 @@ class FederationQueryAuthServlet(BaseFederationServlet): @defer.inlineCallbacks def on_POST(self, origin, content, query, context, event_id): new_content = yield self.handler.on_query_auth_request( - origin, content, event_id + origin, content, context, event_id ) defer.returnValue((200, new_content))