tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Fix SSL for federation http client

Browse source
This commit is contained in:
Mark Haines 2014-09-01 18:43:08 +01:00
parent 00b042a3eb
commit 5452a8ee29
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/http/client.py
View file

@ -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:

2
synapse/http/endpoint.py
View file

@ -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: