diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2022-01-18 16:46:39 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2022-01-18 16:46:39 +0000 |
| commit | 9eab71aa935a2d5c493c974e2f13d10d3cb4c09a (patch) | |
| tree | da0f514c8e8b7d8d88f9ba69d65cc78f73ecd8da | |
| parent | Include whether the requesting user has participated in a thread. (#11577) (diff) | |
| parent | Wording fixes to 1.50.0/1 changelog entries (diff) | |
| download | synapse-9eab71aa935a2d5c493c974e2f13d10d3cb4c09a.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | CHANGES.md | 15 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/app/homeserver.py | 9 |
4 files changed, 29 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md index 8029a9d21c..ced1dcc0db 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,21 @@ +Synapse 1.50.1 (2022-01-18) +=========================== + +This release fixes a bug in Synapse 1.50.0 that could prevent clients from being able to connect to Synapse if the `webclient` resource was enabled. Further details are available in [this issue](https://github.com/matrix-org/synapse/issues/11763). + +Bugfixes +-------- + +- Fix a bug introduced in Synapse 1.50.0rc1 that could cause Matrix clients to be unable to connect to Synapse instances with the `webclient` resource enabled. ([\#11764](https://github.com/matrix-org/synapse/issues/11764)) + + Synapse 1.50.0 (2022-01-18) =========================== +**This release contains a critical bug that may prevent clients from being able to connect. +As such, it is not recommended to upgrade to 1.50.0. Instead, please upgrade straight to +to 1.50.1. Further details are available in [this issue](https://github.com/matrix-org/synapse/issues/11763).** + Please note that we now only support Python 3.7+ and PostgreSQL 10+ (if applicable), because Python 3.6 and PostgreSQL 9.6 have reached end-of-life. No significant changes since 1.50.0rc2. diff --git a/debian/changelog b/debian/changelog index f1245cd3af..18983f5da6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.50.1) stable; urgency=medium + + * New synapse release 1.50.1. + + -- Synapse Packaging team <packages@matrix.org> Tue, 18 Jan 2022 16:06:26 +0000 + matrix-synapse-py3 (1.50.0) stable; urgency=medium * New synapse release 1.50.0. diff --git a/synapse/__init__.py b/synapse/__init__.py index 201925e91d..5ec9f94174 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.50.0" +__version__ = "1.50.1" if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): # We import here so that we don't have to install a bunch of deps when diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 177ce040e8..dd76e07321 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -27,7 +27,6 @@ import synapse import synapse.config.logger from synapse import events from synapse.api.urls import ( - CLIENT_API_PREFIX, FEDERATION_PREFIX, LEGACY_MEDIA_PREFIX, MEDIA_R0_PREFIX, @@ -193,7 +192,13 @@ class SynapseHomeServer(HomeServer): resources.update( { - CLIENT_API_PREFIX: client_resource, + "/_matrix/client/api/v1": client_resource, + "/_matrix/client/r0": client_resource, + "/_matrix/client/v1": client_resource, + "/_matrix/client/v3": client_resource, + "/_matrix/client/unstable": client_resource, + "/_matrix/client/v2_alpha": client_resource, + "/_matrix/client/versions": client_resource, "/.well-known": well_known_resource(self), "/_synapse/admin": AdminRestResource(self), **build_synapse_client_resource_tree(self), |