diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-08-03 14:26:01 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-08-03 14:26:01 +0100 |
| commit | e555bc6551169aa1485c3007c95bb79a3d6cc7d6 (patch) | |
| tree | 6b76612c541949fae182c52eee55f78a4ed8abfc /synapse/federation/transport/server.py | |
| parent | Merge pull request #975 from matrix-org/erikj/multi_event_persist (diff) | |
| parent | E2eKeysHandler: minor tweaks (diff) | |
| download | synapse-e555bc6551169aa1485c3007c95bb79a3d6cc7d6.tar.xz | |
Merge branch 'rav/refactor_device_query' into develop
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 26fa88ae84..1a88413d18 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -367,10 +367,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): |