mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '3.1.x'
Closes gh-36124
This commit is contained in:
commit
c22cbb0e2d
@ -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();
|
||||||
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user