summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-06-09 13:05:15 +0100
committerGitHub <noreply@github.com>2017-06-09 13:05:15 +0100
commit1946867bc220ffc769e2efe3b13eb3b0e87bc2ea (patch)
treea1f6f4f5874108eb058cfa61d61335ba9cdac1f2 /synapse
parentMerge pull request #2263 from matrix-org/erikj/fix_state_woes (diff)
parentComment (diff)
downloadsynapse-1946867bc220ffc769e2efe3b13eb3b0e87bc2ea.tar.xz
Merge pull request #2265 from matrix-org/erikj/remote_leave_outlier
Mark remote invite rejections as outliers
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/federation.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index a333acc4aa..39d2bee8da 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1102,6 +1102,9 @@ class FederationHandler(BaseHandler):
             user_id,
             "leave"
         )
+        # Mark as outlier as we don't have any state for this event; we're not
+        # even in the room.
+        event.internal_metadata.outlier = True
         event = self._sign_event(event)
 
         # Try the host that we succesfully called /make_leave/ on first for