spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-06 01:09:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.4.x' into 3.5.x

Browse Source 
See gh-47940
This commit is contained in:
Stéphane Nicoll
2025-11-10 15:51:19 +01:00
parent 5b960b21b4 5a67f5707e
commit 74d69d6e44
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java
+1 -1
View File
@@ -118,7 +118,7 @@ public final class HttpComponentsClientHttpRequestFactoryBuilder
* {@link org.apache.hc.client5.http.config.ConnectionConfig.Builder}.
* @param connectionConfigCustomizer the customizer to apply
* @return a new {@link HttpComponentsHttpClientBuilder} instance
* @since 3.5.8
* @since 3.4.12
*/
public HttpComponentsClientHttpRequestFactoryBuilder withConnectionConfigCustomizer(
Consumer<ConnectionConfig.Builder> connectionConfigCustomizer) {
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpClientBuilder.java
+1 -1
View File
@@ -132,7 +132,7 @@ public final class HttpComponentsHttpClientBuilder {
Consumer<ConnectionConfig.Builder> connectionConfigCustomizer) {
Assert.notNull(connectionConfigCustomizer, "'connectionConfigCustomizer' must not be null");
return new HttpComponentsHttpClientBuilder(this.customizer, this.connectionManagerCustomizer,
this.socketConfigCustomizer.andThen(this.socketConfigCustomizer), this.connectionConfigCustomizer,
this.socketConfigCustomizer, this.connectionConfigCustomizer.andThen(connectionConfigCustomizer),
this.defaultRequestConfigCustomizer, this.tlsSocketStrategyFactory);
}