Merge pull request #73 from tnagao7/scheme-mapping-rfc

Adapt scheme-mapping to RFC 3986
fujitsu · Jun 30, 2023 · e520079 · e520079
2 parents 67d3292 + 42fbaeb
commit e520079
Showing 1 changed file with 4 additions and 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
@@ -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";
                         }