diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-06-18 17:46:04 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-06-18 17:46:04 +0100 |
commit | ef8415adc2bb14fce19bbe454357bef2b701eca2 (patch) | |
tree | 313bf881fe0583a5129ed0e472667e6be566b6d4 /synapse/http/federation/matrix_federation_agent.py | |
parent | fix changelog (diff) | |
parent | Fix seven contrib files with Python syntax errors (#5446) (diff) | |
download | synapse-dbkr/3pid_verification_logging.tar.xz |
Merge remote-tracking branch 'origin/develop' into dbkr/3pid_verification_logging github/dbkr/3pid_verification_logging dbkr/3pid_verification_logging
Diffstat (limited to 'synapse/http/federation/matrix_federation_agent.py')
-rw-r--r-- | synapse/http/federation/matrix_federation_agent.py | 2 |
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 1334c630cc..b4cbe97b41 100644 --- a/synapse/http/federation/matrix_federation_agent.py +++ b/synapse/http/federation/matrix_federation_agent.py @@ -149,7 +149,7 @@ class MatrixFederationAgent(object): tls_options = None else: tls_options = self._tls_client_options_factory.get_options( - res.tls_server_name.decode("ascii") + res.tls_server_name.decode("ascii"), ) # make sure that the Host header is set correctly |