diff options
author | Matthew Hodgson <matthew@matrix.org> | 2017-01-05 13:03:02 +0000 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2017-01-05 13:03:02 +0000 |
commit | b31ed227388d1ec599399184b127ad09de9735dc (patch) | |
tree | b4d71b9d56c0a611165f1bf6b682d5cdb1a7d04c /synapse/handlers/federation.py | |
parent | Merge pull request #1744 from matrix-org/matthew/timeout_get_missing_events (diff) | |
parent | Merge pull request #1766 from matrix-org/markjh/linear_logging (diff) | |
download | synapse-b31ed227388d1ec599399184b127ad09de9735dc.tar.xz |
Merge branch 'release-v0.18.6' into develop
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 |