Merge pull request #2195 from mnriem/issue-2912-main

Fixes #2192 - Grizzly 2.4.4/4.0.0 missing Content-Type in response
eclipse-ee4j · Nov 1, 2023 · 3d3bcb6 · 3d3bcb6
2 parents e4c7d9d + 1c2d0d2
commit 3d3bcb6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/modules/http-server/src/main/java/org/glassfish/grizzly/http/server/HttpServerFilter.java b/modules/http-server/src/main/java/org/glassfish/grizzly/http/server/HttpServerFilter.java
@@ -325,6 +325,10 @@ private NextAction afterService(final FilterChainContext ctx, final Connection c
 
         final HttpContext context = request.getRequest().getProcessingState().getHttpContext();
 
+        if (request.getRequest().isUpgrade() && !response.getResponse().isUpgrade()) {
+            request.getRequest().setIgnoreContentModifiers(false);
+        }
+
         httpRequestInProgress.remove(context);
         response.finish();
         request.onAfterService();