diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-04 14:04:35 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-04 14:04:35 +0100 |
| commit | b4e2290d8951822bb3309b99830a775d9e5826e2 (patch) | |
| tree | 5333716daa806065b5a59c4815a022b855032e3e /synapse/federation/transport/server.py | |
| parent | Tidy up get_events (diff) | |
| parent | Merge pull request #982 from matrix-org/erikj/fix_port_script (diff) | |
| download | synapse-b4e2290d8951822bb3309b99830a775d9e5826e2.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids_api
Diffstat (limited to 'synapse/federation/transport/server.py')
| -rw-r--r-- | synapse/federation/transport/server.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 3ae7c48457..0bc6e0801d 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -378,10 +378,8 @@ class FederationThirdPartyInviteExchangeServlet(BaseFederationServlet): class FederationClientKeysQueryServlet(BaseFederationServlet): PATH = "/user/keys/query" - @defer.inlineCallbacks def on_POST(self, origin, content, query): - response = yield self.handler.on_query_client_keys(origin, content) - defer.returnValue((200, response)) + return self.handler.on_query_client_keys(origin, content) class FederationClientKeysClaimServlet(BaseFederationServlet): |