HTTPCLIENT-2355, regression: Reset protocol version in the execution …

…context upon 200 response to CONNECT request
apache · Jan 20, 2025 · 8958b36 · 8958b36
1 parent f7f8069
commit 8958b36
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncConnectExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncConnectExec.java
@@ -464,6 +464,7 @@ public void consumeResponse(final HttpResponse response,
                         state.tunnelRefused = true;
                         entityConsumerRef.set(asyncExecCallback.handleResponse(response, entityDetails));
                     } else if (status == HttpStatus.SC_OK) {
+                        clientContext.setProtocolVersion(null);
                         asyncExecCallback.completed();
                     } else {
                         throw new HttpException("Unexpected response to CONNECT request: " + new StatusLine(response));
@@ -552,7 +553,6 @@ private void proceedConnected(
         final HttpClientContext clientContext = scope.clientContext;
         final EndpointInfo endpointInfo = execRuntime.getEndpointInfo();
         if (endpointInfo != null) {
-            clientContext.setProtocolVersion(endpointInfo.getProtocol());
             clientContext.setSSLSession(endpointInfo.getSslSession());
         }
         try {

diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ConnectExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ConnectExec.java
@@ -193,7 +193,6 @@ public ClassicHttpResponse execute(
             }
             final EndpointInfo endpointInfo = execRuntime.getEndpointInfo();
             if (endpointInfo != null) {
-                context.setProtocolVersion(endpointInfo.getProtocol());
                 context.setSSLSession(endpointInfo.getSslSession());
             }
             return chain.proceed(request, scope);
@@ -286,7 +285,9 @@ private ClassicHttpResponse createTunnelToTarget(
         }
 
         final int status = response.getCode();
-        if (status != HttpStatus.SC_OK) {
+        if (status == HttpStatus.SC_OK) {
+            context.setProtocolVersion(null);
+        } else {
             final HttpEntity entity = response.getEntity();
             if (entity != null) {
                 response.setEntity(new ByteArrayEntity(