mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '3.0.x' into 3.1.x
Closes gh-36123
This commit is contained in:
commit
0a51c466f4
@ -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();
|
||||
|
@ -176,7 +176,7 @@ public final class ClientHttpRequestFactories {
|
||||
connectionManagerBuilder.setSSLSocketFactory(socketFactory);
|
||||
}
|
||||
PoolingHttpClientConnectionManager connectionManager = connectionManagerBuilder.build();
|
||||
return HttpClientBuilder.create().setConnectionManager(connectionManager).build();
|
||||
return HttpClientBuilder.create().useSystemProperties().setConnectionManager(connectionManager).build();
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user