Merge branch '3.1.x'

Closes gh-36124
spring-projects · Jun 29, 2023 · c22cbb0 · c22cbb0
2 parents abaade2 + 0a51c46
commit c22cbb0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.../autoconfigure/web/reactive/function/client/HttpComponentsClientHttpConnectorFactory.java b/.../autoconfigure/web/reactive/function/client/HttpComponentsClientHttpConnectorFactory.java
@@ -39,7 +39,7 @@ class HttpComponentsClientHttpConnectorFactory
 
 	@Override
 	public HttpComponentsClientHttpConnector createClientHttpConnector(SslBundle sslBundle) {
-		HttpAsyncClientBuilder builder = HttpAsyncClients.custom();
+		HttpAsyncClientBuilder builder = HttpAsyncClients.custom().useSystemProperties();
 		if (sslBundle != null) {
 			SslOptions options = sslBundle.getOptions();
 			SSLContext sslContext = sslBundle.createSslContext();

diff --git a/...ng-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java b/...ng-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java
@@ -175,7 +175,7 @@ private static HttpClient createHttpClient(Duration readTimeout, SslBundle sslBu
 				connectionManagerBuilder.setSSLSocketFactory(socketFactory);
 			}
 			PoolingHttpClientConnectionManager connectionManager = connectionManagerBuilder.build();
-			return HttpClientBuilder.create().setConnectionManager(connectionManager).build();
+			return HttpClientBuilder.create().useSystemProperties().setConnectionManager(connectionManager).build();
 		}
 
 	}