Skip to content

Commit 0a51c46

Browse files
Merge branch '3.0.x' into 3.1.x
Closes gh-36123
2 parents e2f8fcf + 884489e commit 0a51c46

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/HttpComponentsClientHttpConnectorFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class HttpComponentsClientHttpConnectorFactory
3939

4040
@Override
4141
public HttpComponentsClientHttpConnector createClientHttpConnector(SslBundle sslBundle) {
42-
HttpAsyncClientBuilder builder = HttpAsyncClients.custom();
42+
HttpAsyncClientBuilder builder = HttpAsyncClients.custom().useSystemProperties();
4343
if (sslBundle != null) {
4444
SslOptions options = sslBundle.getOptions();
4545
SSLContext sslContext = sslBundle.createSslContext();

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ private static HttpClient createHttpClient(Duration readTimeout, SslBundle sslBu
176176
connectionManagerBuilder.setSSLSocketFactory(socketFactory);
177177
}
178178
PoolingHttpClientConnectionManager connectionManager = connectionManagerBuilder.build();
179-
return HttpClientBuilder.create().setConnectionManager(connectionManager).build();
179+
return HttpClientBuilder.create().useSystemProperties().setConnectionManager(connectionManager).build();
180180
}
181181

182182
}

0 commit comments

Comments
 (0)