mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-08 06:52:12 +00:00
Merge branch 'release-v0.6.2' of github.com:matrix-org/synapse into develop
This commit is contained in:
commit
b90d377af4
@ -860,9 +860,14 @@ class FederationHandler(BaseHandler):
|
||||
# Only do auth resolution if we have something new to say.
|
||||
# We can't rove an auth failure.
|
||||
do_resolution = False
|
||||
|
||||
provable = [
|
||||
RejectedReason.NOT_ANCESTOR, RejectedReason.NOT_ANCESTOR,
|
||||
]
|
||||
|
||||
for e_id in different_auth:
|
||||
if e_id in have_events:
|
||||
if have_events[e_id] != RejectedReason.AUTH_ERROR:
|
||||
if have_events[e_id] in provable:
|
||||
do_resolution = True
|
||||
break
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user