summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-25 14:28:16 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-25 14:28:16 +0000
commite1f4c52e880792945e2fc6d246494959ca2f2e2b (patch)
tree636796e4d2aa26bbaefd63d47d97e9c67ee4bb98 /synapse/http
parentAdd developer docs for using SAML without a server (#6032) (diff)
parentFix well-known lookups with the federation certificate whitelist (#5997) (diff)
downloadsynapse-e1f4c52e880792945e2fc6d246494959ca2f2e2b.tar.xz
Fix well-known lookups with the federation certificate whitelist (#5997)
Diffstat (limited to 'synapse/http')
-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 feae7de5be..647d26dc56 100644
--- a/synapse/http/federation/matrix_federation_agent.py
+++ b/synapse/http/federation/matrix_federation_agent.py
@@ -217,7 +217,7 @@ class MatrixHostnameEndpoint(object):
             self._tls_options = None
         else:
             self._tls_options = tls_client_options_factory.get_options(
-                self._parsed_uri.host.decode("ascii")
+                self._parsed_uri.host
             )
 
         self._srv_resolver = srv_resolver