From c8428b1f8bf38ec88a40f9ee38fbaead3bad052d Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 5 Feb 2019 22:39:36 -0700 Subject: [PATCH 1/2] Fix contradiction in wellknown discovery for servers Fixes https://github.com/matrix-org/matrix-doc/issues/1854 --- api/server-server/wellknown.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/api/server-server/wellknown.yaml b/api/server-server/wellknown.yaml index 273da7eb..75676646 100644 --- a/api/server-server/wellknown.yaml +++ b/api/server-server/wellknown.yaml @@ -35,9 +35,8 @@ paths: The delegated server information. The ``Content-Type`` for this response SHOULD be ``application/json``, however servers parsing the response should assume that the body is JSON regardless of type. Failures parsing the JSON or invalid data - provided in the resulting parsed JSON must result in server discovery failure (no - attempts should be made to continue finding an IP address/port number to connect - to). + provided in the resulting parsed JSON should not result in discovery failure - + consult the server discovery process for information on how to continue. examples: application/json: { "m.server": "delegated.example.com:1234" From 4b68b5c9392b44f72c7022686c766c408240d4dc Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 6 Feb 2019 12:20:56 -0700 Subject: [PATCH 2/2] Changelog --- changelogs/server_server/newsfragments/1855.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/server_server/newsfragments/1855.clarification diff --git a/changelogs/server_server/newsfragments/1855.clarification b/changelogs/server_server/newsfragments/1855.clarification new file mode 100644 index 00000000..e61e14c6 --- /dev/null +++ b/changelogs/server_server/newsfragments/1855.clarification @@ -0,0 +1 @@ +Clarify that servers should not fail to contact servers if ``/.well-known`` fails.