diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-12-20 11:09:59 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-12-20 11:09:59 +0000 |
| commit | 138708608bb15e7d21041d72cb4709c8d44d3ef8 (patch) | |
| tree | 8223baafae411c2dbd54f812b7da670d11435912 /synapse/handlers/federation.py | |
| parent | Merge tag 'v1.7.1' (diff) | |
| parent | 1.7.2 (diff) | |
| download | synapse-138708608bb15e7d21041d72cb4709c8d44d3ef8.tar.xz | |
Merge tag 'v1.7.2'
Synapse 1.7.2 (2019-12-20) ========================== This release fixes some regressions introduced in Synapse 1.7.0 and 1.7.1. Bugfixes -------- - Fix a regression introduced in Synapse 1.7.1 which caused errors when attempting to backfill rooms over federation. ([\#6576](https://github.com/matrix-org/synapse/issues/6576)) - Fix a bug introduced in Synapse 1.7.0 which caused an error on startup when upgrading from versions before 1.3.0. ([\#6578](https://github.com/matrix-org/synapse/issues/6578))
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index abe02907b9..6fb453ce60 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -797,7 +797,10 @@ class FederationHandler(BaseHandler): events_to_state = {} for e_id in edges: state, auth = yield self._get_state_for_room( - destination=dest, room_id=room_id, event_id=e_id + destination=dest, + room_id=room_id, + event_id=e_id, + include_event_in_state=False, ) auth_events.update({a.event_id: a for a in auth}) auth_events.update({s.event_id: s for s in state}) |