Issue #6642 - move shutdown logic into HttpChannelOverHTTP and HttpCo…

…nnection Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
jetty · Aug 27, 2021 · 949aa6c · 949aa6c
1 parent fa316fc
commit 949aa6c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpChannelOverHTTP.java b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpChannelOverHTTP.java
@@ -103,7 +103,7 @@ public void exchangeTerminated(HttpExchange exchange, Result result)
             closeReason = "failure";
         else if (receiver.isShutdown())
             closeReason = "server close";
-        else if (sender.isShutdown())
+        else if (sender.isShutdown() && response.getStatus() != HttpStatus.SWITCHING_PROTOCOLS_101)
             closeReason = "client close";
 
         if (closeReason == null)

diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
@@ -345,15 +345,6 @@ private Result completing(ByteBuffer chunk, ByteBuffer content)
             return Result.FLUSH;
         }
         _state = State.END;
-
-        // If this is a request, don't close the connection until the server responds.
-        if (_info.isRequest())
-            return Result.DONE;
-
-        // If successfully upgraded it is responsibility of the next protocol to close the connection.
-        if (_info.isResponse() && ((MetaData.Response)_info).getStatus() == HttpStatus.SWITCHING_PROTOCOLS_101)
-            return Result.DONE;
-
         return Boolean.TRUE.equals(_persistent) ? Result.DONE : Result.SHUTDOWN_OUT;
     }
 

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
@@ -28,6 +28,7 @@
 import org.eclipse.jetty.http.HttpHeaderValue;
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.http.HttpParser;
+import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.http.MetaData;
 import org.eclipse.jetty.http.PreEncodedHttpField;
 import org.eclipse.jetty.io.AbstractConnection;
@@ -885,8 +886,10 @@ private void releaseChunk()
         @Override
         protected void onCompleteSuccess()
         {
+            boolean upgrading = _info.getStatus() == HttpStatus.SWITCHING_PROTOCOLS_101;
             release().succeeded();
-            if (_shutdownOut)
+            // If successfully upgraded it is responsibility of the next protocol to close the connection.
+            if (_shutdownOut && !upgrading)
                 getEndPoint().shutdownOutput();
         }