diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-11-06 10:01:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-06 10:01:39 +0000 |
| commit | 807ec3bd99908d2991d2b3d0615b0862610c6dc3 (patch) | |
| tree | 1c46d67920643cbaad45ef63e8cbc645f11c172e /synapse/handlers/federation.py | |
| parent | Add some checks that we aren't using state from rejected events (#6330) (diff) | |
| download | synapse-807ec3bd99908d2991d2b3d0615b0862610c6dc3.tar.xz | |
Fix bug which caused rejected events to be stored with the wrong room state (#6320)
Fixes a bug where rejected events were persisted with the wrong state group. Also fixes an occasional internal-server-error when receiving events over federation which are rejected and (possibly because they are backwards-extremities) have no prev_group. Fixes #6289.
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index b7916de909..05dd8d2671 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -2280,6 +2280,7 @@ class FederationHandler(BaseHandler): return EventContext.with_state( state_group=state_group, + state_group_before_event=context.state_group_before_event, current_state_ids=current_state_ids, prev_state_ids=prev_state_ids, prev_group=prev_group, |