summary refs log tree commit diff
path: root/synapse/http/matrixfederationclient.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-08-10 12:23:54 +0100
committerGitHub <noreply@github.com>2018-08-10 12:23:54 +0100
commit3c0213a21754c9ad8f9309d7548284dd08302a92 (patch)
treebc9f07fdeb29929d3601afbe9a5891d932e519f8 /synapse/http/matrixfederationclient.py
parentMerge pull request #3655 from matrix-org/neilj/disable_hs (diff)
parentmore generic conversion of str/bytes to unicode (diff)
downloadsynapse-3c0213a21754c9ad8f9309d7548284dd08302a92.tar.xz
Merge pull request #3439 from vojeroen/send_sni_for_federation_requests
send SNI for federation requests
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 b3f5415aa6..762273f59b 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -61,14 +61,14 @@ MAX_SHORT_RETRIES = 3
 
 class MatrixFederationEndpointFactory(object):
     def __init__(self, hs):
-        self.tls_server_context_factory = hs.tls_server_context_factory
+        self.tls_client_options_factory = hs.tls_client_options_factory
 
     def endpointForURI(self, uri):
         destination = uri.netloc
 
         return matrix_federation_endpoint(
             reactor, destination, timeout=10,
-            ssl_context_factory=self.tls_server_context_factory
+            tls_client_options_factory=self.tls_client_options_factory
         )