Fixing merge

Author: ryanjbaxter

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java

@@ -275,8 +275,8 @@ public RouteRefreshListener routeRefreshListener(ApplicationEventPublisher publi
 
 	@Bean
 	@ConditionalOnMissingBean
-	public FilteringWebHandler filteringWebHandler(List<GlobalFilter> globalFilters) {
-		return new FilteringWebHandler(globalFilters);
+	public FilteringWebHandler filteringWebHandler(List<GlobalFilter> globalFilters, GatewayProperties properties) {
+		return new FilteringWebHandler(globalFilters, properties.isRouteFilterCacheEnabled());
 	}
 
 	@Bean

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java

@@ -209,8 +209,8 @@ public static class Pool {
 		private boolean metrics = false;
 
 		/**
-		 * Configures the leasing strategy for the pool (fifo or lifo), defaults
-		 * to FIFO which is Netty's default.
+		 * Configures the leasing strategy for the pool (fifo or lifo), defaults to FIFO
+		 * which is Netty's default.
 		 */
 		private LeasingStrategy leasingStrategy = LeasingStrategy.FIFO;
 
@@ -332,8 +332,7 @@ public enum LeasingStrategy {
 	public static class Proxy {
 
 		/**
-		 * proxyType for proxy configuration of Netty HttpClient (http, socks4 or
-		 * socks5).
+		 * proxyType for proxy configuration of Netty HttpClient (http, socks4 or socks5).
 		 */
 		private ProxyProvider.Proxy type = ProxyProvider.Proxy.HTTP;