Merge remote-tracking branch 'upstream/release-v1.43'

This commit is contained in:
Tulir Asokan 2021-09-14 10:00:40 -04:00
commit 1e11b73441
185 changed files with 4254 additions and 2303 deletions

View file

@ -94,7 +94,7 @@ class EventValidator:
self._validate_retention(event)
if event.type == EventTypes.ServerACL:
if not server_matches_acl_event(config.server_name, event):
if not server_matches_acl_event(config.server.server_name, event):
raise SynapseError(
400, "Can't create an ACL event that denies the local server"
)