From 9b88d1684b9f1c594e04d78dd0d58805a7788f38 Mon Sep 17 00:00:00 2001 From: mohit1523 <85980940+mohit1523@users.noreply.github.com> Date: Fri, 18 Aug 2023 21:21:03 +0530 Subject: [PATCH 1/5] Update server-server-api.md I have updated the list of Resolving server names in step 3 from unordered list to ordered list. Because we care about its order --- content/server-server-api.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/server-server-api.md b/content/server-server-api.md index c2b31118c..d0167e01e 100644 --- a/content/server-server-api.md +++ b/content/server-server-api.md @@ -135,20 +135,20 @@ to send. The process overall is as follows: to step 4. If the response is valid, the `m.server` property is parsed as `[:]` and processed as follows: - - If `` is an IP literal, then that IP address + 1. If `` is an IP literal, then that IP address should be used together with the `` or 8448 if no port is provided. The target server must present a valid TLS certificate for the IP address. Requests must be made with a `Host` header containing the IP address, including the port if one was provided. - - If `` is not an IP literal, and + 2. If `` is not an IP literal, and `` is present, an IP address is discovered by looking up CNAME, AAAA or A records for ``. The resulting IP address is used, alongside the ``. Requests must be made with a `Host` header of `:`. The target server must present a valid certificate for ``. - - If `` is not an IP literal and no + 3. If `` is not an IP literal and no `` is present, an SRV record is looked up for `_matrix._tcp.`. This may result in another hostname (to be resolved using AAAA or A records) and port. @@ -156,7 +156,7 @@ to send. The process overall is as follows: a `Host` header containing the ``. The target server must present a valid certificate for ``. - - If no SRV record is found, an IP address is resolved using CNAME, AAAA + 4. If no SRV record is found, an IP address is resolved using CNAME, AAAA or A records. Requests are then made to the resolve IP address and a port of 8448, using a `Host` header of ``. The target server must present a valid From 69fa26eb71b0ff8d1479747b6c8a612825548148 Mon Sep 17 00:00:00 2001 From: mohit1523 <85980940+mohit1523@users.noreply.github.com> Date: Sat, 19 Aug 2023 00:44:44 +0530 Subject: [PATCH 2/5] Create 1567.clarification --- changelogs/server_server/newsfragments/1567.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/server_server/newsfragments/1567.clarification diff --git a/changelogs/server_server/newsfragments/1567.clarification b/changelogs/server_server/newsfragments/1567.clarification new file mode 100644 index 000000000..a1620f0a0 --- /dev/null +++ b/changelogs/server_server/newsfragments/1567.clarification @@ -0,0 +1 @@ +I have updated the list of Resolving server names in step 3 from unordered list to ordered list. Because we care about its order From 305f698d409810ebf43ab5a747645f9f7d2cec41 Mon Sep 17 00:00:00 2001 From: mohit1523 <85980940+mohit1523@users.noreply.github.com> Date: Sat, 19 Aug 2023 01:20:55 +0530 Subject: [PATCH 3/5] Delete 1567.clarification --- changelogs/server_server/newsfragments/1567.clarification | 1 - 1 file changed, 1 deletion(-) delete mode 100644 changelogs/server_server/newsfragments/1567.clarification diff --git a/changelogs/server_server/newsfragments/1567.clarification b/changelogs/server_server/newsfragments/1567.clarification deleted file mode 100644 index a1620f0a0..000000000 --- a/changelogs/server_server/newsfragments/1567.clarification +++ /dev/null @@ -1 +0,0 @@ -I have updated the list of Resolving server names in step 3 from unordered list to ordered list. Because we care about its order From b4a10223503707e3b0c17e64ebd2b48381e889bf Mon Sep 17 00:00:00 2001 From: mohit1523 <85980940+mohit1523@users.noreply.github.com> Date: Sat, 19 Aug 2023 01:22:18 +0530 Subject: [PATCH 4/5] Create 1623.clarification --- changelogs/server_server/newsfragments/1623.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/server_server/newsfragments/1623.clarification diff --git a/changelogs/server_server/newsfragments/1623.clarification b/changelogs/server_server/newsfragments/1623.clarification new file mode 100644 index 000000000..a1620f0a0 --- /dev/null +++ b/changelogs/server_server/newsfragments/1623.clarification @@ -0,0 +1 @@ +I have updated the list of Resolving server names in step 3 from unordered list to ordered list. Because we care about its order From a668e2c9a78863c605d30589feb7f14b109f4210 Mon Sep 17 00:00:00 2001 From: mohit1523 <85980940+mohit1523@users.noreply.github.com> Date: Sat, 19 Aug 2023 01:54:56 +0530 Subject: [PATCH 5/5] Update 1623.clarification --- changelogs/server_server/newsfragments/1623.clarification | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/server_server/newsfragments/1623.clarification b/changelogs/server_server/newsfragments/1623.clarification index a1620f0a0..eab6c384a 100644 --- a/changelogs/server_server/newsfragments/1623.clarification +++ b/changelogs/server_server/newsfragments/1623.clarification @@ -1 +1 @@ -I have updated the list of Resolving server names in step 3 from unordered list to ordered list. Because we care about its order +Switch to ordered list for server name resolution steps.