diff options
| author | Erik Johnston <erikj@jki.re> | 2016-06-20 17:34:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-20 17:34:29 +0100 |
| commit | d8ec81cc3190d230f013b4afbd712842cb14e7b5 (patch) | |
| tree | cff2643b9a1362b7595fec102810908e7f992350 /synapse/federation/transport/server.py | |
| parent | Bump version and changelog (diff) | |
| parent | Linearize some federation endpoints based on (origin, room_id) (diff) | |
| download | synapse-d8ec81cc3190d230f013b4afbd712842cb14e7b5.tar.xz | |
Merge pull request #879 from matrix-org/erikj/linearize_fed_server
Linearize some federation endpoints based on (origin, room_id)
Diffstat (limited to 'synapse/federation/transport/server.py')
| -rw-r--r-- | synapse/federation/transport/server.py | 2 |
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)) |