Skip to content

Commit

Permalink
Fix using TLS for replication (matrix-org#15746)
Browse files Browse the repository at this point in the history
  • Loading branch information
erikjohnston authored Jun 8, 2023
1 parent 6cd6a2a commit 733342a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog.d/15746.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix regression where using TLS for replication did not work. Introduced in v1.85.0.
2 changes: 1 addition & 1 deletion synapse/http/replicationagent.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 733342a

Please sign in to comment.