summary refs log tree commit diff
path: root/synapse/http/federation
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-09-14 04:58:38 +1000
committerGitHub <noreply@github.com>2019-09-14 04:58:38 +1000
commit850dcfd2d3a1d689042fb38c8a16b652244068c2 (patch)
tree933e1775746bb6d40320bdc664bc85547c6bb2e6 /synapse/http/federation
parentAdd developer docs for using SAML without a server (#6032) (diff)
downloadsynapse-850dcfd2d3a1d689042fb38c8a16b652244068c2.tar.xz
Fix well-known lookups with the federation certificate whitelist (#5997)
Diffstat (limited to 'synapse/http/federation')
-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