Skip to content

[stable25] docs: trusted_proxies support IPv6 ranges #35963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 1 commit into from
Jan 3, 2023
Merged

[stable25] docs: trusted_proxies support IPv6 ranges #35963

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions config/config.sample.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,16 +669,16 @@
* and a maximum time for trash bin retention.
*
* Minimum time is the number of days a file will be kept, after which it
* _may be_ deleted. A file may be deleted after the minimum number of days
* is expired if space is needed. The file will not be deleted if space is
* not needed.
* _may be_ deleted. A file may be deleted after the minimum number of days
* is expired if space is needed. The file will not be deleted if space is
* not needed.
*
* Whether "space is needed" depends on whether a user quota is defined or not:
*
* * If no user quota is defined, the available space on the Nextcloud data
* * If no user quota is defined, the available space on the Nextcloud data
* partition sets the limit for the trashbin
* (issues: see https://github.com/nextcloud/server/issues/28451).
* * If a user quota is defined, 50% of the user's remaining quota space sets
* * If a user quota is defined, 50% of the user's remaining quota space sets
* the limit for the trashbin.
*
* Maximum time is the number of days at which it is _guaranteed
Expand Down Expand Up @@ -2005,9 +2005,7 @@
* - IPv4 addresses, e.g. `192.168.2.123`
* - IPv4 ranges in CIDR notation, e.g. `192.168.2.0/24`
* - IPv6 addresses, e.g. `fd9e:21a7:a92c:2323::1`
*
* _(CIDR notation for IPv6 is currently work in progress and thus not
* available as of yet)_
* - IPv6 ranges in CIDR notation, e.g. `2001:db8:85a3:8d3:1319:8a20::/95`
*
* When an incoming request's `REMOTE_ADDR` matches any of the IP addresses
* specified here, it is assumed to be a proxy instead of a client. Thus, the
Expand Down