diff options
author | Mark Haines <mark.haines@matrix.org> | 2017-01-05 11:26:30 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2017-01-05 11:26:30 +0000 |
commit | f784980d2b2bd3827bfef94b0360582b2ef228ba (patch) | |
tree | 0cd29eea7e4aa805c39f6a8f14acc6b09c040f0b /synapse/handlers/federation.py | |
parent | Merge pull request #1758 from matrix-org/markjh/fix_ban_propagation (diff) | |
download | synapse-f784980d2b2bd3827bfef94b0360582b2ef228ba.tar.xz |
Only send events that originate on this server.
Or events that are sent via the federation "send_join" API. This should match the behaviour from before v0.18.5 and #1635 landed.
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r-- | synapse/handlers/federation.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 1d07e4d02b..8c93d6d39f 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -790,6 +790,10 @@ class FederationHandler(BaseHandler): ) event.internal_metadata.outlier = False + # Send this event on behalf of the origin server since they may not + # have an up to data view of the state of the room at this event so + # will not know which servers to send the event to. + event.internal_metadata.send_on_behalf_of = origin context, event_stream_id, max_stream_id = yield self._handle_new_event( origin, event |