diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2022-01-24 13:55:03 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2022-01-24 13:55:03 +0000 |
| commit | c3040dd5cc4636da892a188759ca427d5ac0a0e5 (patch) | |
| tree | ed2192620defeacc81a13671b6c96994ca6e873d /synapse | |
| parent | Remove account data (including client config, push rules and ignored users) u... (diff) | |
| parent | 1.51.0rc2 (diff) | |
| download | synapse-c3040dd5cc4636da892a188759ca427d5ac0a0e5.tar.xz | |
Merge tag 'v1.51.0rc2' into develop
Synapse 1.51.0rc2 (2022-01-24) ============================== Bugfixes -------- - Fix a bug introduced in Synapse 1.40.0 that caused Synapse to fail to process incoming federation traffic after handling a large amount of events in a v1 room. ([\#11806](https://github.com/matrix-org/synapse/issues/11806))
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/storage/databases/main/event_federation.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 4ef8728018..f2fd3b907f 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.51.0rc1" +__version__ = "1.51.0rc2" if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): # We import here so that we don't have to install a bunch of deps when diff --git a/synapse/storage/databases/main/event_federation.py b/synapse/storage/databases/main/event_federation.py index 0856a9332a..ca71f073fc 100644 --- a/synapse/storage/databases/main/event_federation.py +++ b/synapse/storage/databases/main/event_federation.py @@ -1432,7 +1432,10 @@ class EventFederationWorkerStore(SignatureWorkerStore, EventsWorkerStore, SQLBas if room_version.event_format == EventFormatVersions.V1: for prev_event_tuple in prev_events: - if not isinstance(prev_event_tuple, list) or len(prev_events) != 2: + if ( + not isinstance(prev_event_tuple, list) + or len(prev_event_tuple) != 2 + ): logger.info("Invalid prev_events for %s", event_id) break |