summary refs log tree commit diff
path: root/synapse/http/endpoint.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-06-25 15:23:18 +0100
committerErik Johnston <erik@matrix.org>2018-06-25 15:23:18 +0100
commit3320b7c9a464081d0ecff519e3a06d503af7daac (patch)
tree2b725ae5bbd659190840573e38c369d4740d0849 /synapse/http/endpoint.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentNeed to pass reactor to endpoint fac (diff)
downloadsynapse-3320b7c9a464081d0ecff519e3a06d503af7daac.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/http/endpoint.py')
-rw-r--r--synapse/http/endpoint.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/endpoint.py b/synapse/http/endpoint.py

index 928c1c7407..80da870584 100644 --- a/synapse/http/endpoint.py +++ b/synapse/http/endpoint.py
@@ -74,7 +74,7 @@ def matrix_federation_endpoint(reactor, destination, ssl_context_factory=None, reactor, "matrix", domain, protocol="tcp", default_port=default_port, endpoint=transport_endpoint, endpoint_kw_args=endpoint_kw_args - )) + ), reactor) else: return _WrappingEndpointFac(transport_endpoint( reactor, domain, port, **endpoint_kw_args