diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-09-09 14:27:30 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-09-09 14:27:30 +0100 |
| commit | 2c746382e0a5da7e0640b149b2a4620706967324 (patch) | |
| tree | a3629622a9035033fae45d43bc988b5ac51e8961 /synapse/http/matrixfederationclient.py | |
| parent | Don't require pdus in check_auth script (diff) | |
| parent | Better document the intent of the insecure SSL setting (diff) | |
| download | synapse-2c746382e0a5da7e0640b149b2a4620706967324.tar.xz | |
Merge branch 'daniel/insecureclient' into develop
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 1c9e552788..b50a0c445c 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -57,14 +57,14 @@ incoming_responses_counter = metrics.register_counter( class MatrixFederationEndpointFactory(object): def __init__(self, hs): - self.tls_context_factory = hs.tls_context_factory + self.tls_server_context_factory = hs.tls_server_context_factory def endpointForURI(self, uri): destination = uri.netloc return matrix_federation_endpoint( reactor, destination, timeout=10, - ssl_context_factory=self.tls_context_factory + ssl_context_factory=self.tls_server_context_factory ) |