Browse Source

Merge branch '3.1.x'

Closes gh-36124
pull/35874/head
Scott Frederick 3 years ago
parent
commit
c22cbb0e2d
  1. 2
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/HttpComponentsClientHttpConnectorFactory.java
  2. 2
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java

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

@ -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

@ -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…
Cancel
Save