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

Merge branch '2.3.x' 

Closes gh-21745
This commit is contained in:
Phillip Webb 2020-06-07 10:28:01 -07:00
parent 6994466220 abaca95467
commit 6e71994b6b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java
View File

@ -61,7 +61,7 @@ public abstract class AbstractViewResolverProperties {
private Charset charset = DEFAULT_CHARSET; private Charset charset = DEFAULT_CHARSET;
/** /**
* White list of view names that can be resolved. * The view names that can be resolved.
*/ */
private String[] viewNames; private String[] viewNames;

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java
View File

@ -183,8 +183,7 @@ public class TomcatWebServerFactoryCustomizer
if (StringUtils.hasLength(remoteIpHeader)) { if (StringUtils.hasLength(remoteIpHeader)) {
valve.setRemoteIpHeader(remoteIpHeader); valve.setRemoteIpHeader(remoteIpHeader);
} }
// The internal proxies default to a white list of "safe" internal IP // The internal proxies default to a list of "safe" internal IP addresses
// addresses
valve.setInternalProxies(remoteIpProperties.getInternalProxies()); valve.setInternalProxies(remoteIpProperties.getInternalProxies());
try { try {
valve.setHostHeader(remoteIpProperties.getHostHeader()); valve.setHostHeader(remoteIpProperties.getHostHeader());

1
spring-boot-project/spring-boot-docs/src/docs/asciidoc/appendix-application-properties.adoc
View File

@ -13,6 +13,7 @@ NOTE: Property contributions can come from additional jar files on your classpat
Also, you can define your own properties. Also, you can define your own properties.
== Core properties == Core properties
include::config-docs/core.adoc[] include::config-docs/core.adoc[]