diff options
author | Erik Johnston <erik@matrix.org> | 2019-01-25 09:57:01 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-01-25 10:07:08 +0000 |
commit | 62514bb81bfa631d5aaaee7126f43ee0e6a7f828 (patch) | |
tree | 69514e969311bdee344e51a524969c73c0fdb066 /synapse/federation/federation_server.py | |
parent | Review comments (diff) | |
parent | Merge pull request #4448 from matrix-org/erikj/get_pdu_versions (diff) | |
download | synapse-62514bb81bfa631d5aaaee7126f43ee0e6a7f828.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r-- | synapse/federation/federation_server.py | 4 |
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( |