more formatting

pull/977/head
Richard van der Hoff 6 years ago
parent 5812450299
commit b541c2a247

@ -49,31 +49,30 @@ request is aborted.
If the response is valid, the `m.server` property is parsed as If the response is valid, the `m.server` property is parsed as
`<delegated_server_name>[:<delegated_port>]`, and processed as follows: `<delegated_server_name>[:<delegated_port>]`, and processed as follows:
a. If `<delegated_server_name>` is an IP literal, then that IP address should * If `<delegated_server_name>` is an IP literal, then that IP address should be
be used, together with `<delegated_port>`, or 8448 if no port is used, together with `<delegated_port>`, or 8448 if no port is given. The
given. The server should present a valid TLS certificate for server should present a valid TLS certificate for `<delegated_server_name>`.
`<delegated_server_name>`.
* Otherwise, if the port is present, then an IP address is discovered by
b. Otherwise, if the port is present, then an IP address is discovered by looking up an AAAA or A record for `<delegated_server_name>`, and the
looking up an AAAA or A record for `<delegated_server_name>`, and the specified port is used. The server should present a valid TLS certificate
specified port is used. The server should present a valid TLS certificate for `<delegated_server_name>`.
for `<delegated_server_name>`.
(In other words, the federation connection is made to
(In other words, the federation connection is made to `https://<delegated_server_name>:<delegated_port>`).
`https://<delegated_server_name>:<delegated_port>`).
* If the hostname is not an IP literal and no port is given, a second SRV
c. If the hostname is not an IP literal and no port is given, a second SRV record is looked up; this time for `_matrix._tcp.<delegated_server_name>`,
record is looked up; this time for `_matrix._tcp.<delegated_server_name>`, which may give yet another hostname (to be looked up using A/AAAA queries)
which may give yet another hostname (to be looked up using A/AAAA queries) and port. The server must present a TLS cert for the
and port. The server must present a TLS cert for the `<delegated_server_name>` from the .well-known.
`<delegated_server_name>` from the .well-known.
* If no SRV record is found, the server is discovered by looking up an AAAA
d. If no SRV record is found, the server is discovered by looking up an AAAA or A record on `<delegated_server_name>`, and taking the default fallback
or A record on `<delegated_server_name>`, and taking the default fallback port number of 8448.
port number of 8448.
(In other words, the federation connection is made to
(In other words, the federation connection is made to `https://<delegated_server_name>:8448`).
`https://<delegated_server_name>:8448`).
### Structure of the `.well-known` response ### Structure of the `.well-known` response

Loading…
Cancel
Save