diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-09-01 19:56:22 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-09-01 19:56:22 +0100 |
| commit | ff79437d9bceef3e6c824906a7588f3658e80e13 (patch) | |
| tree | 5b3fea43683e68d8e7ea246e97b9958f4a41913e /synapse/http/endpoint.py | |
| parent | Follow API renaming. state -> presence. mtime_ago -> last_active_ago (diff) | |
| parent | Fix SSL for federation http client (diff) | |
| download | synapse-ff79437d9bceef3e6c824906a7588f3658e80e13.tar.xz | |
Merge branch 'server2server_tls' into develop
Diffstat (limited to 'synapse/http/endpoint.py')
| -rw-r--r-- | synapse/http/endpoint.py | 2 |
1 files changed, 1 insertions, 1 deletions
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: |