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 index 4f6de573f68..f01d65a4e13 100644 --- 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 @@ -245,6 +245,7 @@ public final class ClientHttpRequestFactories { @Override protected void prepareConnection(HttpURLConnection connection, String httpMethod) throws IOException { + super.prepareConnection(connection, httpMethod); if (this.sslBundle != null && connection instanceof HttpsURLConnection secureConnection) { SSLSocketFactory socketFactory = this.sslBundle.createSslContext().getSocketFactory(); secureConnection.setSSLSocketFactory(socketFactory); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java index 44b6cb6ecc8..9b9e6aa995a 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java @@ -16,13 +16,20 @@ package org.springframework.boot.web.client; +import java.io.IOException; import java.net.URI; import java.nio.charset.StandardCharsets; import java.time.Duration; import javax.net.ssl.SSLHandshakeException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import org.springframework.boot.ssl.SslBundle; import org.springframework.boot.ssl.SslBundleKey; @@ -94,8 +101,9 @@ abstract class AbstractClientHttpRequestFactoriesTests context.addServlet("test", TestServlet.class).addMapping("/")); try { webServer.start(); int port = webServer.getPort(); @@ -118,9 +127,9 @@ abstract class AbstractClientHttpRequestFactoriesTests