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/homeserver.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/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index a4a65e7286..37a9b126a5 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -338,6 +338,7 @@ def setup(config_options): events.USE_FROZEN_DICTS = config.use_frozen_dicts tls_server_context_factory = context_factory.ServerContextFactory(config) + tls_client_options_factory = context_factory.ClientTLSOptionsFactory(config) database_engine = create_engine(config.database_config) config.database_config["args"]["cp_openfun"] = database_engine.on_new_connection @@ -346,6 +347,7 @@ def setup(config_options): 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, |