diff options
author | Erik Johnston <erik@matrix.org> | 2023-06-08 13:16:46 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2023-06-08 13:16:46 +0100 |
commit | f6321e386c804017f04c7bdfddda6afb618702ba (patch) | |
tree | 56d843464e20d7914256bc52cd44a3670caf0085 /synapse | |
parent | Clear event caches when we purge history (#15609) (diff) | |
parent | Merge branch 'release-v1.85' (diff) | |
download | synapse-f6321e386c804017f04c7bdfddda6afb618702ba.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/http/replicationagent.py | 2 |
1 files changed, 1 insertions, 1 deletions
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, |