Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x' into 2.3.x

Browse Source 
Closes gh-21744
This commit is contained in:
Phillip Webb
2020-06-07 10:27:35 -07:00
parent 9fd6ff7e88 bfe1c281f0
commit abaca95467
3 changed files with 3 additions and 3 deletions
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;
/**
* White list of view names that can be resolved.
* The view names that can be resolved.
*/
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)) {
valve.setRemoteIpHeader(remoteIpHeader);
}
// The internal proxies default to a white list of "safe" internal IP
// addresses
// The internal proxies default to a list of "safe" internal IP addresses
valve.setInternalProxies(remoteIpProperties.getInternalProxies());
try {
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.
== Core properties
include::config-docs/core.adoc[]