Bug-fix: Corrected message stream termination by the async HTTP/1.1 p…

…rotocol handler when the connection has been half-closed by the opposite endpoint
apache · Feb 17, 2025 · 841f6ac · 841f6ac
1 parent 660aea5
commit 841f6ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamHandler.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamHandler.java
@@ -92,10 +92,10 @@ public void requestOutput() {
             @Override
             public void endStream(final List<? extends Header> trailers) throws IOException {
                 requestState = MessageState.COMPLETE;
+                outputChannel.complete(trailers);
                 if (!keepAlive && responseState == MessageState.COMPLETE) {
                     outputChannel.close();
                 }
-                outputChannel.complete(trailers);
             }
 
             @Override

diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamHandler.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamHandler.java
@@ -102,8 +102,8 @@ public void requestOutput() {
 
             @Override
             public void endStream(final List<? extends Header> trailers) throws IOException {
-                outputChannel.complete(trailers);
                 responseState = MessageState.COMPLETE;
+                outputChannel.complete(trailers);
                 if (requestState == MessageState.COMPLETE && !keepAlive) {
                     outputChannel.close();
                 }