Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix using TLS for replication #15746

Merged
merged 2 commits into from
Jun 8, 2023
Merged

Fix using TLS for replication #15746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
102f386
Fix using TLS for replication
erikjohnston Jun 8, 2023
c465014
Newsfile
erikjohnston Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/15746.bugfix
View file
Open in desktop
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
View file
Open in desktop
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