Merge branch 'release-v1.85'
4 files changed, 17 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index fbcacab5bc..5debbc35b6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.85.2 (2023-06-08)
+===========================
+
+Bugfixes
+--------
+
+- Fix regression where using TLS for HTTP replication between workers did not work. Introduced in v1.85.0. ([\#15746](https://github.com/matrix-org/synapse/issues/15746))
+
+
Synapse 1.85.1 (2023-06-07)
===========================
diff --git a/debian/changelog b/debian/changelog
index 6d6f10ddf1..a7503ea60a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.85.2) stable; urgency=medium
+
+ * New Synapse release 1.85.2.
+
+ -- Synapse Packaging team <packages@matrix.org> Thu, 08 Jun 2023 13:04:18 +0100
+
matrix-synapse-py3 (1.85.1) stable; urgency=medium
* New Synapse release 1.85.1.
diff --git a/pyproject.toml b/pyproject.toml
index 5b6123dff6..02c9255f6e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -89,7 +89,7 @@ manifest-path = "rust/Cargo.toml"
[tool.poetry]
name = "matrix-synapse"
-version = "1.85.1"
+version = "1.85.2"
description = "Homeserver for the Matrix decentralised comms protocol"
authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
license = "Apache-2.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,
|
