Merge branch '2.5.x' into 2.6.x

Closes gh-30033
This commit is contained in:
Andy Wilkinson
2022-03-02 12:21:20 +00:00

View File

@@ -95,7 +95,6 @@ public class ServletWebServerFactoryAutoConfiguration {
@Bean
@ConditionalOnClass(name = "org.apache.catalina.startup.Tomcat")
@ConditionalOnMissingFilterBean(ForwardedHeaderFilter.class)
ForwardedHeaderFilterCustomizer tomcatForwardedHeaderFilterCustomizer(ServerProperties serverProperties) {
return (filter) -> filter.setRelativeRedirects(serverProperties.getTomcat().isUseRelativeRedirects());
}