diff options
| author | Erik Johnston <erik@matrix.org> | 2017-04-11 11:13:32 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-04-11 11:13:32 +0100 |
| commit | f3cf3ff8b687e3ed699c1862f4fbc8be1f866f79 (patch) | |
| tree | 3abc25d85a4ad7b00bc632c4d7c6e695957ad305 | |
| parent | trust a hypothetical future riot.im IS (diff) | |
| parent | Merge branch 'release-v0.20.0' of github.com:matrix-org/synapse (diff) | |
| download | synapse-f3cf3ff8b687e3ed699c1862f4fbc8be1f866f79.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
| -rw-r--r-- | CHANGES.rst | 9 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/federation.py | 8 |
3 files changed, 14 insertions, 5 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 6659c6671a..6c85241eaf 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,12 @@ +Changes in synapse v0.20.0 (2017-04-11) +======================================= + +Bug fixes: + +* Fix joining rooms over federation where not all servers in the room saw the + new server had joined (PR #2094) + + Changes in synapse v0.20.0-rc1 (2017-03-30) =========================================== diff --git a/synapse/__init__.py b/synapse/__init__.py index 580927abf4..2e5f4e0ead 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.20.0-rc1" +__version__ = "0.20.0" diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 6ed5ce9e10..2d9126dd86 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1097,15 +1097,15 @@ class FederationHandler(BaseHandler): user_id, "leave" ) - signed_event = self._sign_event(event) + event = self._sign_event(event) except SynapseError: raise except CodeMessageException as e: logger.warn("Failed to reject invite: %s", e) raise SynapseError(500, "Failed to reject invite") - # Try the host we successfully got a response to /make_join/ - # request first. + # Try the host that we succesfully called /make_leave/ on first for + # the /send_leave/ request. try: target_hosts.remove(origin) target_hosts.insert(0, origin) @@ -1115,7 +1115,7 @@ class FederationHandler(BaseHandler): try: yield self.replication_layer.send_leave( target_hosts, - signed_event + event ) except SynapseError: raise |