summary refs log tree commit diff
path: root/synapse/http/federation
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-03-17 22:32:25 +0100
committerGitHub <noreply@github.com>2020-03-17 21:32:25 +0000
commitc37db0211e36cd298426ff8811e547b0acd10bf4 (patch)
tree4ca360ac774aa64c29a763d2394680da0afad498 /synapse/http/federation
parentSet charset to utf-8 when adding headers for certain text content types (#7044) (diff)
downloadsynapse-c37db0211e36cd298426ff8811e547b0acd10bf4.tar.xz
Share SSL contexts for non-federation requests (#7094)
Extends #5794 etc to the SimpleHttpClient so that it also applies to non-federation requests.

Fixes #7092.

Diffstat (limited to 'synapse/http/federation')
-rw-r--r--synapse/http/federation/matrix_federation_agent.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/federation/matrix_federation_agent.py b/synapse/http/federation/matrix_federation_agent.py
index 647d26dc56..f5f917f5ae 100644
--- a/synapse/http/federation/matrix_federation_agent.py
+++ b/synapse/http/federation/matrix_federation_agent.py
@@ -45,7 +45,7 @@ class MatrixFederationAgent(object):
     Args:
         reactor (IReactor): twisted reactor to use for underlying requests
 
-        tls_client_options_factory (ClientTLSOptionsFactory|None):
+        tls_client_options_factory (FederationPolicyForHTTPS|None):
             factory to use for fetching client tls options, or none to disable TLS.
 
         _srv_resolver (SrvResolver|None):