summary refs log tree commit diff
path: root/synapse/federation/federation_server.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-06-29 13:55:02 +0100
committerGitHub <noreply@github.com>2018-06-29 13:55:02 +0100
commite3b4043800f376582676f52767cffcf1e9b8cc99 (patch)
tree7b0f021479039d87c3729667c4cbb99467228756 /synapse/federation/federation_server.py
parentMerge pull request #3465 from matrix-org/matthew/as_ip_lock (diff)
parenttopfile update (diff)
downloadsynapse-e3b4043800f376582676f52767cffcf1e9b8cc99.tar.xz
Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checking
Check the state of prev_events a bit more thoroughly when coming over federation
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r--synapse/federation/federation_server.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index a00420a24b..fe51ba6806 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -549,7 +549,9 @@ class FederationServer(FederationBase):
                 affected=pdu.event_id,
             )
 
-        yield self.handler.on_receive_pdu(origin, pdu, get_missing=True)
+        yield self.handler.on_receive_pdu(
+            origin, pdu, get_missing=True, sent_to_us_directly=True,
+        )
 
     def __str__(self):
         return "<ReplicationLayer(%s)>" % self.server_name