Skip to content
Snippets Groups Projects
Commit 5452a8ee authored by Mark Haines's avatar Mark Haines
Browse files

Fix SSL for federation http client

parent 00b042a3
No related branches found
No related tags found
No related merge requests found
...@@ -180,7 +180,7 @@ class TwistedHttpClient(HttpClient): ...@@ -180,7 +180,7 @@ class TwistedHttpClient(HttpClient):
# TODO: setup and pass in an ssl_context to enable TLS # TODO: setup and pass in an ssl_context to enable TLS
endpoint = matrix_endpoint( endpoint = matrix_endpoint(
reactor, destination, timeout=10, reactor, destination, timeout=10,
ssl_context_factory=self.hs.tls_tls_context_factory ssl_context_factory=self.hs.tls_context_factory
) )
while True: while True:
......
...@@ -53,7 +53,7 @@ def matrix_endpoint(reactor, destination, ssl_context_factory=None, ...@@ -53,7 +53,7 @@ def matrix_endpoint(reactor, destination, ssl_context_factory=None,
default_port = 8080 default_port = 8080
else: else:
transport_endpoint = SSL4ClientEndpoint transport_endpoint = SSL4ClientEndpoint
endpoint_kw_args.update(ssl_context_factory=ssl_context_factory) endpoint_kw_args.update(sslContextFactory=ssl_context_factory)
default_port = 443 default_port = 443
if port is None: if port is None:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment