summary refs log tree commit diff
path: root/synapse/federation/federation_server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-01-23 17:27:49 +0000
committerErik Johnston <erik@matrix.org>2019-01-23 17:27:49 +0000
commit2a8edbaf74eec2e73634c40ecd9f1faa79b472c2 (patch)
tree00211aef7f4d7f5799b2104ed9d30ba05df635bf /synapse/federation/federation_server.py
parentMerge branch 'erikj/msc_1813' into erikj/require_format_version (diff)
parentNewsfile (diff)
downloadsynapse-2a8edbaf74eec2e73634c40ecd9f1faa79b472c2.tar.xz
Merge branch 'erikj/get_pdu_versions' into erikj/require_format_version
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 17eccaaea0..dde166e295 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py
@@ -463,8 +463,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(