From 102f386b2b000e3d1de8b8e00a6cd448de6dc42d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 8 Jun 2023 10:49:35 +0100 Subject: [PATCH 1/2] Fix using TLS for replication Fixes #15744. --- synapse/http/replicationagent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/http/replicationagent.py b/synapse/http/replicationagent.py index 800f21873d66..d6ba6f0e577d 100644 --- a/synapse/http/replicationagent.py +++ b/synapse/http/replicationagent.py @@ -76,7 +76,7 @@ def endpointForURI(self, uri: URI) -> IStreamClientEndpoint: endpoint = wrapClientTLS( # The 'port' argument below isn't actually used by the function self.context_factory.creatorForNetloc( - self.instance_map[worker_name].host, + self.instance_map[worker_name].host.encode("utf-8"), self.instance_map[worker_name].port, ), endpoint, From c4650146e463311a5b5d903f27c3203e7284c32e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 8 Jun 2023 10:51:21 +0100 Subject: [PATCH 2/2] Newsfile --- changelog.d/15746.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/15746.bugfix diff --git a/changelog.d/15746.bugfix b/changelog.d/15746.bugfix new file mode 100644 index 000000000000..8d3e22f2e5ce --- /dev/null +++ b/changelog.d/15746.bugfix @@ -0,0 +1 @@ +Fix regression where using TLS for replication did not work. Introduced in v1.85.0.