root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch 'gh-1989' into 1.1.x

This commit is contained in:
Andy Wilkinson 2014-11-25 13:53:57 +00:00
parent 9ef8335881 2b4eee5e53
commit 02e925cb4e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@ -70,10 +70,10 @@ content into your application; rather pick only the properties that you need.
server.ssl.trust-store-type= server.ssl.trust-store-type=
server.tomcat.access-log-pattern= # log pattern of the access log server.tomcat.access-log-pattern= # log pattern of the access log
server.tomcat.access-log-enabled=false # is access logging enabled server.tomcat.access-log-enabled=false # is access logging enabled
server.tomcat.internal-proxies=10\.\d{1,3}\.\d{1,3}\.\d{1,3}|\ server.tomcat.internal-proxies=10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|\\
192\.168\.\d{1,3}\.\d{1,3}|\ 192\\.168\\.\\d{1,3}\\.\\d{1,3}|\\
169\.254\.\d{1,3}\.\d{1,3}|\ 169\\.254\\.\\d{1,3}\\.\\d{1,3}|\\
127\.\d{1,3}\.\d{1,3}\.\d{1,3} # regular expression matching trusted IP addresses 127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3} # regular expression matching trusted IP addresses
server.tomcat.protocol-header=x-forwarded-proto # front end proxy forward header server.tomcat.protocol-header=x-forwarded-proto # front end proxy forward header
server.tomcat.port-header= # front end proxy port header server.tomcat.port-header= # front end proxy port header
server.tomcat.remote-ip-header=x-forwarded-for server.tomcat.remote-ip-header=x-forwarded-for

6
spring-boot-docs/src/main/asciidoc/howto.adoc
View File

@ -493,9 +493,13 @@ to `application.properties`, e.g.
[indent=0] [indent=0]
---- ----
server.tomcat.internal_proxies=192\.168\.\d{1,3}\.\d{1,3} server.tomcat.internal_proxies=192\\.168\\.\\d{1,3}\\.\\d{1,3}
---- ----
NOTE: The double backslashes are only required when you're using a properties file for
configuration. If you are using YAML, single backslashes are sufficient and a value
that's equivalent to the one shown above would be `192\.168\.\d{1,3}\.\d{1,3}`.
Alternatively, you can take complete control of the configuration of the `RemoteIpValve` Alternatively, you can take complete control of the configuration of the `RemoteIpValve`
by configuring and adding it in a `TomcatEmbeddedServletContainerFactory` bean. by configuring and adding it in a `TomcatEmbeddedServletContainerFactory` bean.