summary refs log tree commit diff
path: root/synapse/http/federation/matrix_federation_agent.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-03-17 17:40:37 +0100
committerGitHub <noreply@github.com>2020-03-17 16:40:37 +0000
commit85845e048cd8d2674ad38dd00e8a934b4b960adc (patch)
tree69629a1b986a9df0cd3412faf4beb3dcaba7dee5 /synapse/http/federation/matrix_federation_agent.py
parentShare SSL options for well-known requests (#29) (diff)
downloadsynapse-85845e048cd8d2674ad38dd00e8a934b4b960adc.tar.xz
Share SSL contexts for non-federation requests (#30)
* Share SSL contexts for non-federation requests

* newsfile
Diffstat (limited to 'synapse/http/federation/matrix_federation_agent.py')
-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 e0c075e382..f595349a0e 100644 --- a/synapse/http/federation/matrix_federation_agent.py +++ b/synapse/http/federation/matrix_federation_agent.py
@@ -61,7 +61,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):