diff --git a/CHANGES.md b/CHANGES.md index 74b008bfc4..112c0c0d61 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -38,6 +38,7 @@ git branch -u origin/main main # And optionally git remote prune origin ``` + - Allow cleartext (non-SSL) connections to Matrix servers on LAN hosts (#3166) Changes in Element 1.1.6 (2021-04-16) =================================================== diff --git a/vector/src/main/res/xml/network_security_config.xml b/vector/src/main/res/xml/network_security_config.xml index 4bf79f16ba..b9f3d03986 100644 --- a/vector/src/main/res/xml/network_security_config.xml +++ b/vector/src/main/res/xml/network_security_config.xml @@ -13,6 +13,16 @@ <domain includeSubdomains="true">10.0.2.2</domain> <!-- Onion services --> <domain includeSubdomains="true">onion</domain> + + <!-- Domains that are used for LANs --> + <!-- These are IANA recognized special use domain names, see https://www.iana.org/assignments/special-use-domain-names/special-use-domain-names.xhtml --> + <domain includeSubdomains="true">home.arpa</domain> + <domain includeSubdomains="true">local</domain> <!-- Note this has been reserved for use with mDNS --> + <domain includeSubdomains="true">test</domain> + <!-- These are observed in the wild either by convention or RFCs that have not been accepted, and are not currently TLDs --> + <domain includeSubdomains="true">home</domain> + <domain includeSubdomains="true">lan</domain> + <domain includeSubdomains="true">localdomain</domain> </domain-config> <debug-overrides>