Merge branch '2.7.x'

kongfanxin-java · Mar 2, 2022 · f95e5b9 · f95e5b9
2 parents 81b8b6a + 324c431
commit f95e5b9
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/...ingframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfiguration.java b/...ingframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfiguration.java
@@ -96,7 +96,6 @@ static class ForwardedHeaderFilterConfiguration {
 
 		@Bean
 		@ConditionalOnClass(name = "org.apache.catalina.startup.Tomcat")
-		@ConditionalOnMissingFilterBean(ForwardedHeaderFilter.class)
 		ForwardedHeaderFilterCustomizer tomcatForwardedHeaderFilterCustomizer(ServerProperties serverProperties) {
 			return (filter) -> filter.setRelativeRedirects(serverProperties.getTomcat().isUseRelativeRedirects());
 		}