Merge branch '3.5.x'

snicoll · snicoll · commit bb9d3ecdfb19 · 2025-11-10T15:52:23.000+01:00
diff --git a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpClientBuilder.java b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/HttpComponentsHttpClientBuilder.java
@@ -131,7 +131,7 @@ public HttpComponentsHttpClientBuilder withConnectionConfigCustomizer(
 			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);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public HttpComponentsHttpClientBuilder withConnectionConfigCustomizer(`
`131`	`131`	`Consumer<ConnectionConfig.Builder> connectionConfigCustomizer) {`
`132`	`132`	`Assert.notNull(connectionConfigCustomizer, "'connectionConfigCustomizer' must not be null");`
`133`	`133`	`return new HttpComponentsHttpClientBuilder(this.customizer, this.connectionManagerCustomizer,`
`134`		`- this.socketConfigCustomizer.andThen(this.socketConfigCustomizer), this.connectionConfigCustomizer,`
	`134`	`+ this.socketConfigCustomizer, this.connectionConfigCustomizer.andThen(connectionConfigCustomizer),`
`135`	`135`	`this.defaultRequestConfigCustomizer, this.tlsSocketStrategyFactory);`
`136`	`136`	`}`
`137`	`137`