summary refs log tree commit diff
path: root/synapse/federation/transport
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-08-03 14:26:01 +0100
committerRichard van der Hoff <richard@matrix.org>2016-08-03 14:26:01 +0100
commite555bc6551169aa1485c3007c95bb79a3d6cc7d6 (patch)
tree6b76612c541949fae182c52eee55f78a4ed8abfc /synapse/federation/transport
parentMerge pull request #975 from matrix-org/erikj/multi_event_persist (diff)
parentE2eKeysHandler: minor tweaks (diff)
downloadsynapse-e555bc6551169aa1485c3007c95bb79a3d6cc7d6.tar.xz
Merge branch 'rav/refactor_device_query' into develop
Diffstat (limited to 'synapse/federation/transport')
-rw-r--r--synapse/federation/transport/server.py4
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):