From 42fbaeb7e1d0d8a3a9a7c34bc2ec5b6b6097bf28 Mon Sep 17 00:00:00 2001 From: Takahiro Nagao Date: Fri, 30 Jun 2023 18:46:23 +0900 Subject: [PATCH] Use lowercase scheme name in scheme-mapping --- .../java/org/glassfish/grizzly/http/server/Request.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/launcher-impl/glassfish/src/main/java/org/glassfish/grizzly/http/server/Request.java b/launcher-impl/glassfish/src/main/java/org/glassfish/grizzly/http/server/Request.java index 70bfc75..d5cdd41 100644 --- a/launcher-impl/glassfish/src/main/java/org/glassfish/grizzly/http/server/Request.java +++ b/launcher-impl/glassfish/src/main/java/org/glassfish/grizzly/http/server/Request.java @@ -406,8 +406,10 @@ public void initialize(final HttpRequestPacket request, final FilterChainContext if (disableSchemeMappingValidation) { scheme = suggestedScheme; } else { - if (suggestedScheme == null || "http".equalsIgnoreCase(suggestedScheme) || "https".equalsIgnoreCase(suggestedScheme)) { - scheme = suggestedScheme; + if (suggestedScheme == null) { + scheme = null; + } else if ("https".equalsIgnoreCase(suggestedScheme)) { + scheme = "https"; } else { scheme = "http"; }