From cb9a8d406064a4b4388d2bb99159ae789d0ff230 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Wed, 25 Aug 2021 11:27:56 +1000 Subject: [PATCH] Issue #6642 - change HttpGenerator state to END before returning Signed-off-by: Lachlan Roberts --- .../src/main/java/org/eclipse/jetty/http/HttpGenerator.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 index 7d21a0bc52c4..8a35c6c6ed53 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java @@ -344,6 +344,7 @@ private Result completing(ByteBuffer chunk, ByteBuffer content) _endOfContent = EndOfContent.UNKNOWN_CONTENT; return Result.FLUSH; } + _state = State.END; // If this is an upgrade then we don't want to close the connection. if (_info.isResponse() && ((MetaData.Response)_info).getStatus() == HttpStatus.SWITCHING_PROTOCOLS_101) @@ -356,8 +357,6 @@ else if (_info.isRequest()) if (connectionHeader != null && connectionHeader.contains(HttpHeaderValue.UPGRADE.asString())) return Result.DONE; } - - _state = State.END; return Boolean.TRUE.equals(_persistent) ? Result.DONE : Result.SHUTDOWN_OUT; }