Fixed header cache for unknown values

Avoid adding the unknown marker into the CACHE index. Issue introduced in #11661 fixing #11659
jetty · May 18, 2024 · d79a0a8 · d79a0a8
1 parent 16995ad
commit d79a0a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
@@ -146,22 +146,17 @@ public class HttpParser
             {
                 HttpField field = new PreEncodedHttpField(HttpHeader.CONTENT_TYPE, type);
                 map.put(field.toString(), field);
-                map.put(field.toString().replace(": ", ":"), field);
 
                 for (String charset : new String[]{"utf-8", "iso-8859-1"})
                 {
                     PreEncodedHttpField field1 = new PreEncodedHttpField(HttpHeader.CONTENT_TYPE, type + ";charset=" + charset);
                     map.put(field1.toString(), field1);
-                    map.put(field1.toString().replace(": ", ":"), field1);
                     PreEncodedHttpField field2 = new PreEncodedHttpField(HttpHeader.CONTENT_TYPE, type + "; charset=" + charset);
                     map.put(field2.toString(), field2);
-                    map.put(field1.toString().replace(": ", ":"), field2);
                     PreEncodedHttpField field3 = new PreEncodedHttpField(HttpHeader.CONTENT_TYPE, type + ";charset=" + charset.toUpperCase(Locale.ENGLISH));
                     map.put(field3.toString(), field3);
-                    map.put(field1.toString().replace(": ", ":"), field3);
                     PreEncodedHttpField field4 = new PreEncodedHttpField(HttpHeader.CONTENT_TYPE, type + "; charset=" + charset.toUpperCase(Locale.ENGLISH));
                     map.put(field4.toString(), field4);
-                    map.put(field1.toString().replace(": ", ":"), field4);
                 }
             }
             return map;

diff --git a/jetty-core/jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java b/jetty-core/jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
@@ -365,13 +365,14 @@ public void testHeaderCache()
         assertThat(HttpParser.CACHE.getBest("Content-Type: text/plain\n").toString(), is("Content-Type: text/plain"));
         assertThat(HttpParser.CACHE.getBest("content-type: text/plain\r\n").toString(), is("Content-Type: text/plain"));
         assertThat(HttpParser.CACHE.getBest("content-type: text/plain\n").toString(), is("Content-Type: text/plain"));
-        assertThat(HttpParser.CACHE.getBest("Content-Type:text/plain\r\n").toString(), is("Content-Type: text/plain"));
-        assertThat(HttpParser.CACHE.getBest("Content-Type:text/plain\n").toString(), is("Content-Type: text/plain"));
 
         assertThat(HttpParser.CACHE.getBest("Content-Type: unknown\r\n").toString(), is("Content-Type: \u0000"));
         assertThat(HttpParser.CACHE.getBest("Content-Type: unknown\n").toString(), is("Content-Type: \u0000"));
         assertThat(HttpParser.CACHE.getBest("content-type: unknown\r\n").toString(), is("Content-Type: \u0000"));
         assertThat(HttpParser.CACHE.getBest("content-type: unknown\n").toString(), is("Content-Type: \u0000"));
+
+        assertThat(HttpParser.CACHE.getBest("Content-Type:text/plain\r\n").toString(), is("Content-Type: \u0000"));
+        assertThat(HttpParser.CACHE.getBest("Content-Type:text/plain\n").toString(), is("Content-Type: \u0000"));
         assertThat(HttpParser.CACHE.getBest("content-type:unknown\r\n").toString(), is("Content-Type: \u0000"));
         assertThat(HttpParser.CACHE.getBest("content-type:unknown\n").toString(), is("Content-Type: \u0000"));
     }