Merge branch '4.3.x'

Author: ryanjbaxter

.github/workflows/ci.yaml

@@ -1,3 +1,4 @@
+
 name: Spring Cloud Gateway CI Job
 
 on:

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/filter/factory/RetryGatewayFilterFactory.java

@@ -246,8 +246,6 @@ public void reset(ServerWebExchange exchange) {
 		Connection conn = exchange.getAttribute(ServerWebExchangeUtils.CLIENT_RESPONSE_CONN_ATTR);
 		if (conn != null) {
 			trace("disposing response connection before next iteration");
-			conn.dispose();
-			exchange.getAttributes().remove(ServerWebExchangeUtils.CLIENT_RESPONSE_CONN_ATTR);
 		}
 		ServerWebExchangeUtils.reset(exchange);
 	}

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/support/ServerWebExchangeUtils.java

@@ -34,6 +34,7 @@
 import org.apache.commons.logging.LogFactory;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.netty.Connection;
 
 import org.springframework.cloud.client.loadbalancer.Response;
 import org.springframework.cloud.gateway.filter.factory.GatewayFilterFactory;
@@ -222,6 +223,17 @@ public static boolean setResponseStatus(ServerWebExchange exchange, HttpStatus h
 
 	public static void reset(ServerWebExchange exchange) {
 		// TODO: what else to do to reset exchange?
+		// Dispose and clean up client connection to prevent connection leaks
+		Connection conn = exchange.getAttribute(CLIENT_RESPONSE_CONN_ATTR);
+		if (conn != null) {
+			conn.dispose();
+			exchange.getAttributes().remove(CLIENT_RESPONSE_CONN_ATTR);
+		}
+
+		// Clean up client response
+		exchange.getAttributes().remove(CLIENT_RESPONSE_ATTR);
+
+		// Remove added response headers
 		Set<String> addedHeaders = exchange.getAttributeOrDefault(CLIENT_RESPONSE_HEADER_NAMES, Collections.emptySet());
 		addedHeaders.forEach(header -> exchange.getResponse().getHeaders().remove(header));
 		removeAlreadyRouted(exchange);