HTTPCORE-796: abort redirected requests during the expect-continue handshake the same way as errors

Author: ok2c

httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java

@@ -183,7 +183,7 @@ public ClassicHttpResponse execute(
                             }
                             response = null;
                             continue;
-                        } else if (status >= HttpStatus.SC_CLIENT_ERROR) {
+                        } else if (status >= HttpStatus.SC_REDIRECTION) {
                             conn.terminateRequest(request);
                         } else {
                             conn.sendRequestEntity(request);

httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamHandler.java

@@ -230,11 +230,14 @@ void consumeHeader(final HttpResponse response, final EntityDetails entityDetail
                 keepAlive = false;
             }
         }
+        boolean abort = false;
         if (requestState.get() == MessageState.ACK) {
             if (status == HttpStatus.SC_CONTINUE || status >= HttpStatus.SC_SUCCESS) {
                 outputChannel.setSocketTimeout(timeout);
                 requestState.set(MessageState.BODY);
-                if (status < HttpStatus.SC_CLIENT_ERROR) {
+                if (status >= HttpStatus.SC_REDIRECTION) {
+                    abort = true;
+                } else {
                     exchangeHandler.produce(internalDataChannel);
                 }
             }
@@ -243,7 +246,7 @@ void consumeHeader(final HttpResponse response, final EntityDetails entityDetail
             return;
         }
         if (requestState.get() == MessageState.BODY) {
-            if (status >= HttpStatus.SC_CLIENT_ERROR) {
+            if (abort || status >= HttpStatus.SC_CLIENT_ERROR) {
                 requestState.set(MessageState.COMPLETE);
                 if (!outputChannel.abortGracefully()) {
                     keepAlive = false;