diff options
| author | Erik Johnston <erik@matrix.org> | 2019-04-26 18:14:23 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-04-26 18:14:23 +0100 |
| commit | d6118c5be61aed49f1aa3fac53a25a670bbbd245 (patch) | |
| tree | 269071e6c6a87cc70a177f48f9546e97a5b0f1e2 /synapse/http/federation/matrix_federation_agent.py | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #5103 from matrix-org/rav/fix_notif_loop (diff) | |
| download | synapse-d6118c5be61aed49f1aa3fac53a25a670bbbd245.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ratelimit_3pid_invite
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 |