diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-08-10 12:23:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-10 12:23:54 +0100 |
commit | 3c0213a21754c9ad8f9309d7548284dd08302a92 (patch) | |
tree | bc9f07fdeb29929d3601afbe9a5891d932e519f8 /synapse/app/federation_reader.py | |
parent | Merge pull request #3655 from matrix-org/neilj/disable_hs (diff) | |
parent | more generic conversion of str/bytes to unicode (diff) | |
download | synapse-3c0213a21754c9ad8f9309d7548284dd08302a92.tar.xz |
Merge pull request #3439 from vojeroen/send_sni_for_federation_requests
send SNI for federation requests
Diffstat (limited to 'synapse/app/federation_reader.py')
-rw-r--r-- | synapse/app/federation_reader.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/app/federation_reader.py b/synapse/app/federation_reader.py index 7af00b8bcf..57d96c13a2 100644 --- a/synapse/app/federation_reader.py +++ b/synapse/app/federation_reader.py @@ -143,11 +143,13 @@ def start(config_options): database_engine = create_engine(config.database_config) tls_server_context_factory = context_factory.ServerContextFactory(config) + tls_client_options_factory = context_factory.ClientTLSOptionsFactory(config) ss = FederationReaderServer( config.server_name, db_config=config.database_config, tls_server_context_factory=tls_server_context_factory, + tls_client_options_factory=tls_client_options_factory, config=config, version_string="Synapse/" + get_version_string(synapse), database_engine=database_engine, |