Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-08-26 04:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:matrix-org/synapse into develop

Browse Source
This commit is contained in:
Erik Johnston 2017-04-11 11:13:32 +01:00
commit f3cf3ff8b6
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGES.rst
View File

@ -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) Changes in synapse v0.20.0-rc1 (2017-03-30)
=========================================== ===========================================

2
synapse/__init__.py
View File

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server. """ This is a reference implementation of a Matrix home server.
""" """
__version__ = "0.20.0-rc1" __version__ = "0.20.0"

8
synapse/handlers/federation.py
View File

@ -1097,15 +1097,15 @@ class FederationHandler(BaseHandler):
user_id, user_id,
"leave" "leave"
) )
signed_event = self._sign_event(event) event = self._sign_event(event)
except SynapseError: except SynapseError:
raise raise
except CodeMessageException as e: except CodeMessageException as e:
logger.warn("Failed to reject invite: %s", e) logger.warn("Failed to reject invite: %s", e)
raise SynapseError(500, "Failed to reject invite") raise SynapseError(500, "Failed to reject invite")
# Try the host we successfully got a response to /make_join/ # Try the host that we succesfully called /make_leave/ on first for
# request first. # the /send_leave/ request.
try: try:
target_hosts.remove(origin) target_hosts.remove(origin)
target_hosts.insert(0, origin) target_hosts.insert(0, origin)
@ -1115,7 +1115,7 @@ class FederationHandler(BaseHandler):
try: try:
yield self.replication_layer.send_leave( yield self.replication_layer.send_leave(
target_hosts, target_hosts,
signed_event event
) )
except SynapseError: except SynapseError:
raise raise