Fully prepare connection when using SSL bundle

Fixes gh-36007

Author: wilkinsona

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java

@@ -245,6 +245,7 @@ private static class SimpleClientHttpsRequestFactory extends SimpleClientHttpReq
 
 			@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);

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,16 +101,18 @@ void getReturnsRequestFactoryWithConfiguredReadTimeout() {
 		assertThat(readTimeout((T) requestFactory)).isEqualTo(Duration.ofSeconds(120).toMillis());
 	}
 
-	@Test
-	void connectWithSslBundle() throws Exception {
+	@ParameterizedTest
+	@CsvSource({ "GET", "POST" })
+	void connectWithSslBundle(String httpMethod) throws Exception {
 		TomcatServletWebServerFactory webServerFactory = new TomcatServletWebServerFactory(0);
 		Ssl ssl = new Ssl();
 		ssl.setClientAuth(ClientAuth.NEED);
 		ssl.setKeyPassword("password");
 		ssl.setKeyStore("classpath:test.jks");
 		ssl.setTrustStore("classpath:test.jks");
 		webServerFactory.setSsl(ssl);
-		WebServer webServer = webServerFactory.getWebServer();
+		WebServer webServer = webServerFactory
+			.getWebServer((context) -> context.addServlet("test", TestServlet.class).addMapping("/"));
 		try {
 			webServer.start();
 			int port = webServer.getPort();
@@ -118,9 +127,9 @@ void connectWithSslBundle() throws Exception {
 			SslBundle sslBundle = SslBundle.of(stores, SslBundleKey.of("password"));
 			ClientHttpRequestFactory secureRequestFactory = ClientHttpRequestFactories
 				.get(ClientHttpRequestFactorySettings.DEFAULTS.withSslBundle(sslBundle));
-			ClientHttpRequest secureRequest = secureRequestFactory.createRequest(uri, HttpMethod.GET);
+			ClientHttpRequest secureRequest = secureRequestFactory.createRequest(uri, HttpMethod.valueOf(httpMethod));
 			String secureResponse = StreamUtils.copyToString(secureRequest.execute().getBody(), StandardCharsets.UTF_8);
-			assertThat(secureResponse).contains("HTTP Status 404 – Not Found");
+			assertThat(secureResponse).contains("Received " + httpMethod + " request to /");
 		}
 		finally {
 			webServer.stop();
@@ -131,4 +140,13 @@ void connectWithSslBundle() throws Exception {
 
 	protected abstract long readTimeout(T requestFactory);
 
+	public static class TestServlet extends HttpServlet {
+
+		@Override
+		public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+			res.getWriter().println("Received " + req.getMethod() + " request to " + req.getRequestURI());
+		}
+
+	}
+
 }