Merge branch '3.1.x'

mhalbritter · mhalbritter · commit 62a6d384f66f · 2023-11-29T14:00:01.000+01:00
Closes gh-38600
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java
@@ -212,7 +212,8 @@ private static HttpClient createHttpClient(Duration readTimeout, SslBundle sslBu
 						options.getEnabledProtocols(), options.getCiphers(), new DefaultHostnameVerifier());
 				connectionManagerBuilder.setSSLSocketFactory(socketFactory);
 			}
-			PoolingHttpClientConnectionManager connectionManager = connectionManagerBuilder.build();
+			PoolingHttpClientConnectionManager connectionManager = connectionManagerBuilder.useSystemProperties()
+				.build();
 			return HttpClientBuilder.create().useSystemProperties().setConnectionManager(connectionManager).build();
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,8 @@ private static HttpClient createHttpClient(Duration readTimeout, SslBundle sslBu`
`212`	`212`	`options.getEnabledProtocols(), options.getCiphers(), new DefaultHostnameVerifier());`
`213`	`213`	`connectionManagerBuilder.setSSLSocketFactory(socketFactory);`
`214`	`214`	`}`
`215`		`- PoolingHttpClientConnectionManager connectionManager = connectionManagerBuilder.build();`
	`215`	`+ PoolingHttpClientConnectionManager connectionManager = connectionManagerBuilder.useSystemProperties()`
	`216`	`+ .build();`
`216`	`217`	`return HttpClientBuilder.create().useSystemProperties().setConnectionManager(connectionManager).build();`
`217`	`218`	`}`
`218`	`219`