diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-09-01 18:43:08 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-09-01 18:43:08 +0100 |
| commit | 5452a8ee2990658b5582c74bb96e7624085f0b9b (patch) | |
| tree | 5b3fea43683e68d8e7ea246e97b9958f4a41913e /synapse/http | |
| parent | Merge remote-tracking branch 'origin/develop' into server2server_tls (diff) | |
| download | synapse-5452a8ee2990658b5582c74bb96e7624085f0b9b.tar.xz | |
Fix SSL for federation http client
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/client.py | 2 | ||||
| -rw-r--r-- | synapse/http/endpoint.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index acc39742de..093bdf0e3f 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -180,7 +180,7 @@ class TwistedHttpClient(HttpClient): # TODO: setup and pass in an ssl_context to enable TLS endpoint = matrix_endpoint( reactor, destination, timeout=10, - ssl_context_factory=self.hs.tls_tls_context_factory + ssl_context_factory=self.hs.tls_context_factory ) while True: diff --git a/synapse/http/endpoint.py b/synapse/http/endpoint.py index d91500b07d..a6ebe23567 100644 --- a/synapse/http/endpoint.py +++ b/synapse/http/endpoint.py @@ -53,7 +53,7 @@ def matrix_endpoint(reactor, destination, ssl_context_factory=None, default_port = 8080 else: transport_endpoint = SSL4ClientEndpoint - endpoint_kw_args.update(ssl_context_factory=ssl_context_factory) + endpoint_kw_args.update(sslContextFactory=ssl_context_factory) default_port = 443 if port is None: |