From 91306b58d526eb8f1c7702253fe5e89c3999e360 Mon Sep 17 00:00:00 2001 From: Damiano Albani Date: Sun, 3 Apr 2022 21:14:17 +0200 Subject: [PATCH 1/2] Refer to list of internal proxies in reference documentation See gh-30461 --- .../spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc index e5465b0515..50eb70777d 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc @@ -452,7 +452,7 @@ If you use Tomcat, you can additionally configure the names of the headers used ---- Tomcat is also configured with a default regular expression that matches internal proxies that are to be trusted. -By default, IP addresses in `10/8`, `192.168/16`, `169.254/16` and `127/8` are trusted. +See the `server.tomcat.remoteip.internal-proxies` property in section <> for more details. You can customize the valve's configuration by adding an entry to `application.properties`, as shown in the following example: [source,yaml,indent=0,subs="verbatim",configprops,configblocks] From 83cfc951f84a923e5d001abf04a673b128b5cd89 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 5 Apr 2022 14:34:06 +0100 Subject: [PATCH 2/2] Polish "Refer to list of internal proxies in reference documentation" See gh-30461 --- .../spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc index 50eb70777d..de48b9cd94 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc @@ -451,8 +451,8 @@ If you use Tomcat, you can additionally configure the names of the headers used protocol-header: "x-your-protocol-header" ---- -Tomcat is also configured with a default regular expression that matches internal proxies that are to be trusted. -See the `server.tomcat.remoteip.internal-proxies` property in section <> for more details. +Tomcat is also configured with a regular expression that matches internal proxies that are to be trusted. +See the <> for its default value. You can customize the valve's configuration by adding an entry to `application.properties`, as shown in the following example: [source,yaml,indent=0,subs="verbatim",configprops,configblocks]