Merge branch '3.4.x' into 3.5.x

See gh-47940

Author: snicoll

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilder.java

@@ -118,7 +118,7 @@ public HttpComponentsClientHttpRequestFactoryBuilder withSocketConfigCustomizer(
 	 * {@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

@@ -132,7 +132,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);
 	}