root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '3.1.x' 

Closes gh-36124
This commit is contained in:
Scott Frederick 2023-06-29 16:55:19 -06:00
parent abaade28ea 0a51c466f4
commit c22cbb0e2d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ class HttpComponentsClientHttpConnectorFactory
@Override @Override
public HttpComponentsClientHttpConnector createClientHttpConnector(SslBundle sslBundle) { public HttpComponentsClientHttpConnector createClientHttpConnector(SslBundle sslBundle) {
HttpAsyncClientBuilder builder = HttpAsyncClients.custom(); HttpAsyncClientBuilder builder = HttpAsyncClients.custom().useSystemProperties();
if (sslBundle != null) { if (sslBundle != null) {
SslOptions options = sslBundle.getOptions(); SslOptions options = sslBundle.getOptions();
SSLContext sslContext = sslBundle.createSslContext(); SSLContext sslContext = sslBundle.createSslContext();

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

@ -175,7 +175,7 @@ public final class ClientHttpRequestFactories {
connectionManagerBuilder.setSSLSocketFactory(socketFactory); connectionManagerBuilder.setSSLSocketFactory(socketFactory);
} }
PoolingHttpClientConnectionManager connectionManager = connectionManagerBuilder.build(); PoolingHttpClientConnectionManager connectionManager = connectionManagerBuilder.build();
return HttpClientBuilder.create().setConnectionManager(connectionManager).build(); return HttpClientBuilder.create().useSystemProperties().setConnectionManager(connectionManager).build();
} }
} }