diff options
| author | Erik Johnston <erik@matrix.org> | 2023-06-08 13:03:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-08 13:03:48 +0100 |
| commit | 733342ad3ef271a2c5bd4ba442a15fa3be3dab30 (patch) | |
| tree | f2cc23ee3c34c7195067a28431668646954c130c | |
| parent | Update changelog (diff) | |
| download | synapse-733342ad3ef271a2c5bd4ba442a15fa3be3dab30.tar.xz | |
Fix using TLS for replication (#15746)
Fixes #15744.
| -rw-r--r-- | changelog.d/15746.bugfix | 1 | ||||
| -rw-r--r-- | synapse/http/replicationagent.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/15746.bugfix b/changelog.d/15746.bugfix new file mode 100644 index 0000000000..8d3e22f2e5 --- /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. diff --git a/synapse/http/replicationagent.py b/synapse/http/replicationagent.py index 800f21873d..d6ba6f0e57 100644 --- a/synapse/http/replicationagent.py +++ b/synapse/http/replicationagent.py @@ -76,7 +76,7 @@ class ReplicationEndpointFactory: 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, |