Skip to content

Commit b956b0e

Browse files
Merge pull request #35956 from nextcloud/docs/ipv6-cidr
docs: trusted_proxies support IPv6 ranges
2 parents 961dcdd + a1fef7b commit b956b0e

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

config/config.sample.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2027,9 +2027,7 @@
20272027
* - IPv4 addresses, e.g. `192.168.2.123`
20282028
* - IPv4 ranges in CIDR notation, e.g. `192.168.2.0/24`
20292029
* - IPv6 addresses, e.g. `fd9e:21a7:a92c:2323::1`
2030-
*
2031-
* _(CIDR notation for IPv6 is currently work in progress and thus not
2032-
* available yet)_
2030+
* - IPv6 ranges in CIDR notation, e.g. `2001:db8:85a3:8d3:1319:8a20::/95`
20332031
*
20342032
* When an incoming request's `REMOTE_ADDR` matches any of the IP addresses
20352033
* specified here, it is assumed to be a proxy instead of a client. Thus, the
@@ -2288,9 +2286,9 @@
22882286
*
22892287
* For instance, if the phone property should default to the private scope
22902288
* instead of the local one:
2291-
*
2289+
*
22922290
* ::
2293-
*
2291+
*
22942292
* [
22952293
* \OCP\Accounts\IAccountManager::PROPERTY_PHONE => \OCP\Accounts\IAccountManager::SCOPE_PRIVATE
22962294
* ]

0 commit comments

Comments
 (0)