summary refs log tree commit diff
path: root/synapse/federation/transport/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-07-01 15:12:57 +0100
committerErik Johnston <erik@matrix.org>2015-07-01 15:12:57 +0100
commit67362a9a034a9a8945c10faf78e9b13598e3dc9e (patch)
treec523d50061b18df57d33397dfdfb586fd267bbdd /synapse/federation/transport/server.py
parentclarify readme a bit more (diff)
parentBump changelog and version to v0.9.3 (diff)
downloadsynapse-0.9.3.tar.xz
Merge branch 'release-v0.9.3' of github.com:matrix-org/synapse v0.9.3
Diffstat (limited to 'synapse/federation/transport/server.py')
-rw-r--r--synapse/federation/transport/server.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py

index 31190e700a..bad93c6b2f 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py
@@ -94,6 +94,7 @@ class TransportLayerServer(object): yield self.keyring.verify_json_for_server(origin, json_request) logger.info("Request from %s", origin) + request.authenticated_entity = origin defer.returnValue((origin, content))