From de8a94f30de97b59db534fba09ded07c14715414 Mon Sep 17 00:00:00 2001
From: rstoyanchev <rossen.stoyanchev@broadcom.com>
Date: Thu, 14 Nov 2024 09:28:47 +0000
Subject: [PATCH] Do not set up CookieStore in Apache connector

Closes gh-33822
---
 .../client/reactive/HttpComponentsClientHttpConnector.java   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpConnector.java b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpConnector.java
index 6e445868c2..4fcc9829ea 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpConnector.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpConnector.java
@@ -24,7 +24,6 @@ import java.util.concurrent.CancellationException;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import org.apache.hc.client5.http.cookie.BasicCookieStore;
 import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
 import org.apache.hc.client5.http.impl.async.HttpAsyncClients;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
@@ -107,12 +106,10 @@ public class HttpComponentsClientHttpConnector implements ClientHttpConnector, C
 			Function<? super ClientHttpRequest, Mono<Void>> requestCallback) {
 
 		HttpClientContext context = this.contextProvider.apply(method, uri);
-		if (context.getCookieStore() == null) {
-			context.setCookieStore(new BasicCookieStore());
-		}
 
 		HttpComponentsClientHttpRequest request =
 				new HttpComponentsClientHttpRequest(method, uri, context, this.dataBufferFactory);
+
 		return requestCallback.apply(request).then(Mono.defer(() -> execute(request, context)));
 	}