OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'release-v0.6.2' of github.com:matrix-org/synapse into develop

pull/63/head
Erik Johnston 2015-02-10 10:33:35 +00:00
parent 8ce100c7b4 20db147ef3
commit b90d377af4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/handlers/federation.py
View File

@ -860,9 +860,14 @@ class FederationHandler(BaseHandler):
# Only do auth resolution if we have something new to say. # Only do auth resolution if we have something new to say.
# We can't rove an auth failure. # We can't rove an auth failure.
do_resolution = False do_resolution = False
provable = [
RejectedReason.NOT_ANCESTOR, RejectedReason.NOT_ANCESTOR,
]
for e_id in different_auth: for e_id in different_auth:
if e_id in have_events: if e_id in have_events:
if have_events[e_id] != RejectedReason.AUTH_ERROR: if have_events[e_id] in provable:
do_resolution = True do_resolution = True
break break