summary refs log tree commit diff
path: root/synapse/federation/federation_server.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-01-24 18:47:15 +0000
committerGitHub <noreply@github.com>2019-01-24 18:47:15 +0000
commitedc1e21dbee50a2d2e28c30d0197af8c984d73b7 (patch)
tree08902e6b1564b865a5b21194c844d85a693ef095 /synapse/federation/federation_server.py
parentMerge pull request #4405 from matrix-org/erikj/fixup_rejecting_invites (diff)
parentReview comments (diff)
downloadsynapse-edc1e21dbee50a2d2e28c30d0197af8c984d73b7.tar.xz
Merge pull request #4448 from matrix-org/erikj/get_pdu_versions
Add room_version param to get_pdu
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r--synapse/federation/federation_server.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py

index 37d29e7027..cb729c69ea 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py
@@ -457,8 +457,10 @@ class FederationServer(FederationBase): for e in content["auth_chain"] ] + room_version = yield self.store.get_room_version(room_id) + signed_auth = yield self._check_sigs_and_hash_and_fetch( - origin, auth_chain, outlier=True + origin, auth_chain, outlier=True, room_version=room_version, ) ret = yield self.handler.on_query_auth(