Skip to content

Commit 05d4093

Browse files
committed
Merge branch '2.5.x' into 2.6.x
Closes gh-30544
2 parents 53b2c85 + bc81ae8 commit 05d4093

File tree

1 file changed

+2
-2
lines changed
  • spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto

1 file changed

+2
-2
lines changed

spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,8 @@ If you use Tomcat, you can additionally configure the names of the headers used
452452
protocol-header: "x-your-protocol-header"
453453
----
454454

455-
Tomcat is also configured with a default regular expression that matches internal proxies that are to be trusted.
456-
By default, IP addresses in `10/8`, `192.168/16`, `169.254/16` and `127/8` are trusted.
455+
Tomcat is also configured with a regular expression that matches internal proxies that are to be trusted.
456+
See the <<application-properties.adoc#application-properties.server.server.tomcat.remoteip.internal-proxies,configprop:server.tomcat.remoteip.internal-proxies[] entry in the appendix>> for its default value.
457457
You can customize the valve's configuration by adding an entry to `application.properties`, as shown in the following example:
458458

459459
[source,yaml,indent=0,subs="verbatim",configprops,configblocks]

0 commit comments

Comments
 (0)