Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 21:24:51 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release-v0.28.1' into develop

Browse source
This commit is contained in:
Richard van der Hoff 2018-05-01 18:16:57 +01:00
commit ca7211104e
3 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/handlers/message.py
View file

@ -22,7 +22,7 @@ import six
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
@ -625,6 +625,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