summary refs log tree commit diff
path: root/synapse/http/matrixfederationclient.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-09-15 16:52:38 +0100
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-09-15 16:52:38 +0100
commit2c8f16257a3c8d4ad330f584f59f5e678207af14 (patch)
tree2745c1dff2e67b7bec31ca96d79bce999f9bf788 /synapse/http/matrixfederationclient.py
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentUse shorter config key name (diff)
downloadsynapse-2c8f16257a3c8d4ad330f584f59f5e678207af14.tar.xz
Merge pull request #272 from matrix-org/daniel/insecureclient
Allow configuration to ignore invalid SSL certs
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
-rw-r--r--synapse/http/matrixfederationclient.py4
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 )