diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-05-01 18:52:44 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-05-01 18:52:44 +0100 |
| commit | 40d1bbd257567740b9b8d08caeed4d3dae2a6aa4 (patch) | |
| tree | d42e105d71b2173ee58d85e43ca4d83431188adc /synapse/handlers/message.py | |
| parent | Update CHANGES.rst (diff) | |
| parent | changelog for 0.28.1 (diff) | |
| download | synapse-40d1bbd257567740b9b8d08caeed4d3dae2a6aa4.tar.xz | |
fix conflict in changelog from previous release
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 21628a8540..53beb2b9ab 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -16,7 +16,7 @@ from twisted.internet import defer, reactor from twisted.python.failure import Failure -from synapse.api.constants import EventTypes, Membership +from synapse.api.constants import EventTypes, Membership, MAX_DEPTH from synapse.api.errors import AuthError, Codes, SynapseError from synapse.crypto.event_signing import add_hashes_and_signatures from synapse.events.utils import serialize_event @@ -624,6 +624,10 @@ class EventCreationHandler(object): if prev_events_and_hashes: depth = max([d for _, _, d in prev_events_and_hashes]) + 1 + # we cap depth of generated events, to ensure that they are not + # rejected by other servers (and so that they can be persisted in + # the db) + depth = min(depth, MAX_DEPTH) else: depth = 1 |