diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2021-02-11 11:56:03 -0500 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2021-02-11 11:56:03 -0500 |
| commit | 2c9b4a5f16b7950e7ebb2e5f445e7ae925e61113 (patch) | |
| tree | 78e2159e896bb99e7585739c2ed2e4488447bda7 /synapse/rest/well_known.py | |
| parent | Ensure that we never stop reconnecting to redis (#9391) (diff) | |
| parent | Clarify when new ratelimiting was added. (diff) | |
| download | synapse-2c9b4a5f16b7950e7ebb2e5f445e7ae925e61113.tar.xz | |
Merge tag 'v1.27.0rc2' into develop
Synapse 1.27.0rc2 (2021-02-11) ============================== Features -------- - Further improvements to the user experience of registration via single sign-on. ([\#9297](https://github.com/matrix-org/synapse/issues/9297)) Bugfixes -------- - Fix ratelimiting introduced in v1.27.0rc1 for invites to respect the `ratelimit` flag on application services. ([\#9302](https://github.com/matrix-org/synapse/issues/9302)) - Do not automatically calculate `public_baseurl` since it can be wrong in some situations. Reverts behaviour introduced in v1.26.0. ([\#9313](https://github.com/matrix-org/synapse/issues/9313)) Improved Documentation ---------------------- - Clarify the sample configuration for changes made to the template loading code. ([\#9310](https://github.com/matrix-org/synapse/issues/9310))
Diffstat (limited to 'synapse/rest/well_known.py')
| -rw-r--r-- | synapse/rest/well_known.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/rest/well_known.py b/synapse/rest/well_known.py index 241fe746d9..f591cc6c5c 100644 --- a/synapse/rest/well_known.py +++ b/synapse/rest/well_known.py @@ -34,6 +34,10 @@ class WellKnownBuilder: self._config = hs.config def get_well_known(self): + # if we don't have a public_baseurl, we can't help much here. + if self._config.public_baseurl is None: + return None + result = {"m.homeserver": {"base_url": self._config.public_baseurl}} if self._config.default_identity_server: |