diff options
| author | David Baker <dave@matrix.org> | 2016-04-07 16:35:22 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-04-07 16:35:22 +0100 |
| commit | 9c99ab4572623a8a9554e6c0292f34059252c6b7 (patch) | |
| tree | 3b231aab16688d64bc6e30561ddd42949c2ab727 /synapse/handlers/federation.py | |
| parent | Remove code that's now been obsoleted or moved elsewhere (diff) | |
| parent | Merge pull request #703 from matrix-org/erikj/member (diff) | |
| download | synapse-9c99ab4572623a8a9554e6c0292f34059252c6b7.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/pushers_use_event_actions
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index fc5e0b0590..3686738e59 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -284,6 +284,9 @@ class FederationHandler(BaseHandler): def backfill(self, dest, room_id, limit, extremities=[]): """ Trigger a backfill request to `dest` for the given `room_id` """ + if dest == self.server_name: + raise SynapseError(400, "Can't backfill from self.") + if not extremities: extremities = yield self.store.get_oldest_events_in_room(room_id) @@ -450,7 +453,7 @@ class FederationHandler(BaseHandler): likely_domains = [ domain for domain, depth in curr_domains - if domain is not self.server_name + if domain != self.server_name ] @defer.inlineCallbacks |