Use lowercase for charsets #11741

gregw · gregw · commit 3d7f5da03cfc · 2024-10-06T11:28:21.000+11:00
Fix #11741 as per the WhatTFWG recommendations, use lower case for charset names. Took the opportunity for some minor optimizations: + use the already made HttpField instance in MimeTypes.Type rather than create a new one in the HttpParser.CACHE + keep the MimeType.Type associated with the pre encoded Content-Type fields
diff --git a/jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/ContentResponseTest.java b/jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/ContentResponseTest.java
@@ -23,9 +23,11 @@
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.util.Callback;
+import org.hamcrest.Matchers;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -114,7 +116,7 @@ public boolean handle(Request request, Response response, Callback callback) thr
         assertEquals(200, response.getStatus());
         assertEquals(content, response.getContentAsString());
         assertEquals(mediaType, response.getMediaType());
-        assertEquals(encoding, response.getEncoding());
+        assertThat(response.getEncoding(), Matchers.equalToIgnoringCase(encoding));
     }
 
     @ParameterizedTest
@@ -144,6 +146,6 @@ public boolean handle(Request request, Response response, Callback callback) thr
         assertEquals(200, response.getStatus());
         assertEquals(content, response.getContentAsString());
         assertEquals(mediaType, response.getMediaType());
-        assertEquals(encoding, response.getEncoding());
+        assertThat(response.getEncoding(), Matchers.equalToIgnoringCase(encoding));
     }
 }
diff --git a/jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/util/TypedContentProviderTest.java b/jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/util/TypedContentProviderTest.java
@@ -29,6 +29,7 @@
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.util.Fields;
+import org.hamcrest.Matchers;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
@@ -96,7 +97,7 @@ public void testFormContentProviderWithDifferentContentType(Scenario scenario) t
             protected void service(Request request, Response response) throws Throwable
             {
                 assertEquals("POST", request.getMethod());
-                assertEquals(contentType, request.getHeaders().get(HttpHeader.CONTENT_TYPE));
+                assertThat(request.getHeaders().get(HttpHeader.CONTENT_TYPE), Matchers.equalToIgnoringCase(contentType));
                 assertEquals(content, Content.Source.asString(request));
             }
         });
diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/java/org/eclipse/jetty/ee10/test/HttpInputTransientErrorTest.java b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/java/org/eclipse/jetty/ee10/test/HttpInputTransientErrorTest.java
@@ -46,6 +46,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalToIgnoringCase;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
@@ -181,7 +182,7 @@ public void onError(Throwable t)
 
             assertThat("Unexpected response status\n" + response + response.getContent(), response.getStatus(), is(HttpStatus.OK_200));
             assertThat(response.get(HttpHeader.CONNECTION), nullValue());
-            assertThat(response.get(HttpHeader.CONTENT_TYPE), is("text/plain;charset=UTF-8"));
+            assertThat(response.get(HttpHeader.CONTENT_TYPE), equalToIgnoringCase("text/plain;charset=utf-8"));
             assertThat(response.getContent(), containsString("read=10"));
             assertInstanceOf(TimeoutException.class, failure.get());
             assertThat(events, contains("onError", "onAllDataRead"));
@@ -273,7 +274,7 @@ public void onError(Throwable t)
             HttpTester.Response response = HttpTester.parseResponse(localEndPoint.getResponse(false, 5, TimeUnit.SECONDS));
 
             assertThat("Unexpected response status\n" + response + response.getContent(), response.getStatus(), is(HttpStatus.OK_200));
-            assertThat(response.get(HttpHeader.CONTENT_TYPE), is("text/plain;charset=UTF-8"));
+            assertThat(response.get(HttpHeader.CONTENT_TYPE), equalToIgnoringCase("text/plain;charset=utf-8"));
             assertThat(response.getContent(), containsString("read=10"));
             assertThat(failure.get(), nullValue());
         }
@@ -382,7 +383,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
             HttpTester.Response response = HttpTester.parseResponse(localEndPoint.getResponse(false, 5, TimeUnit.SECONDS));
 
             assertThat("Unexpected response status\n" + response + response.getContent(), response.getStatus(), is(HttpStatus.OK_200));
-            assertThat(response.get(HttpHeader.CONTENT_TYPE), is("text/plain;charset=UTF-8"));
+            assertThat(response.get(HttpHeader.CONTENT_TYPE), equalToIgnoringCase("text/plain;charset=utf-8"));
             assertThat(response.getContent(), containsString("read=10"));
             assertInstanceOf(IOException.class, failure.get());
             assertInstanceOf(TimeoutException.class, failure.get().getCause());
diff --git a/jetty-ee11/jetty-ee11-servlet/src/test/java/org/eclipse/jetty/ee11/servlet/ResponseTest.java b/jetty-ee11/jetty-ee11-servlet/src/test/java/org/eclipse/jetty/ee11/servlet/ResponseTest.java
@@ -47,6 +47,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.emptyString;
+import static org.hamcrest.Matchers.equalToIgnoringCase;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
@@ -140,7 +141,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
         HttpTester.Response response = HttpTester.parseResponse(responseBuffer);
 
         assertThat(response.getStatus(), is(410));
-        assertThat(response.get("Content-Type"), is("text/html;charset=ISO-8859-1"));
+        assertThat(response.get("Content-Type"), equalToIgnoringCase("text/html;charset=iso-8859-1"));
         assertThat(response.getContent(), containsString("The content is gone."));
     }
 
diff --git a/jetty-ee11/jetty-ee11-tests/jetty-ee11-test-integration/src/test/java/org/eclipse/jetty/ee11/test/HttpInputTransientErrorTest.java b/jetty-ee11/jetty-ee11-tests/jetty-ee11-test-integration/src/test/java/org/eclipse/jetty/ee11/test/HttpInputTransientErrorTest.java
@@ -45,6 +45,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalToIgnoringCase;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
@@ -101,7 +102,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
             {
                 AsyncContext asyncContext = req.startAsync(req, resp);
                 asyncContext.setTimeout(0);
-                resp.setContentType("text/plain;charset=UTF-8");
+                resp.setContentType("text/plain;charset=utf-8");
 
                 // Since the client sends a request with a content-length header, but sends
                 // the content only after idle timeout expired, this ReadListener will have
@@ -132,7 +133,7 @@ public void onAllDataRead() throws IOException
                     {
                         events.add("onAllDataRead");
                         resp.setStatus(HttpStatus.OK_200);
-                        resp.setContentType("text/plain;charset=UTF-8");
+                        resp.setContentType("text/plain;charset=utf-8");
                         resp.getWriter().println("read=" + counter.get());
                         asyncContext.complete();
                     }
@@ -180,7 +181,7 @@ public void onError(Throwable t)
 
             assertThat("Unexpected response status\n" + response + response.getContent(), response.getStatus(), is(HttpStatus.OK_200));
             assertThat(response.get(HttpHeader.CONNECTION), nullValue());
-            assertThat(response.get(HttpHeader.CONTENT_TYPE), is("text/plain;charset=UTF-8"));
+            assertThat(response.get(HttpHeader.CONTENT_TYPE), equalToIgnoringCase("text/plain;charset=utf-8"));
             assertThat(response.getContent(), containsString("read=10"));
             assertInstanceOf(TimeoutException.class, failure.get());
             assertThat(events, contains("onError", "onAllDataRead"));
@@ -200,7 +201,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp)
             {
                 AsyncContext asyncContext = req.startAsync(req, resp);
                 asyncContext.setTimeout(0);
-                resp.setContentType("text/plain;charset=UTF-8");
+                resp.setContentType("text/plain;charset=utf-8");
 
                 // Not calling setReadListener will make Jetty set the ServletChannelState
                 // in state WAITING upon doPost return, so idle timeouts are ignored.
@@ -272,7 +273,7 @@ public void onError(Throwable t)
             HttpTester.Response response = HttpTester.parseResponse(localEndPoint.getResponse(false, 5, TimeUnit.SECONDS));
 
             assertThat("Unexpected response status\n" + response + response.getContent(), response.getStatus(), is(HttpStatus.OK_200));
-            assertThat(response.get(HttpHeader.CONTENT_TYPE), is("text/plain;charset=UTF-8"));
+            assertThat(response.get(HttpHeader.CONTENT_TYPE), equalToIgnoringCase("text/plain;charset=utf-8"));
             assertThat(response.getContent(), containsString("read=10"));
             assertThat(failure.get(), nullValue());
         }
@@ -362,7 +363,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
 
                 String content = IO.toString(req.getInputStream());
                 resp.setStatus(HttpStatus.OK_200);
-                resp.setContentType("text/plain;charset=UTF-8");
+                resp.setContentType("text/plain;charset=utf-8");
                 resp.getWriter().println("read=" + content.length());
             }
         });
@@ -381,7 +382,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
             HttpTester.Response response = HttpTester.parseResponse(localEndPoint.getResponse(false, 5, TimeUnit.SECONDS));
 
             assertThat("Unexpected response status\n" + response + response.getContent(), response.getStatus(), is(HttpStatus.OK_200));
-            assertThat(response.get(HttpHeader.CONTENT_TYPE), is("text/plain;charset=UTF-8"));
+            assertThat(response.get(HttpHeader.CONTENT_TYPE), equalToIgnoringCase("text/plain;charset=utf-8"));
             assertThat(response.getContent(), containsString("read=10"));
             assertInstanceOf(IOException.class, failure.get());
             assertInstanceOf(TimeoutException.class, failure.get().getCause());
diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/java/org/eclipse/jetty/ee9/test/HttpInputTransientErrorTest.java b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/java/org/eclipse/jetty/ee9/test/HttpInputTransientErrorTest.java
@@ -94,7 +94,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
             {
                 AsyncContext asyncContext = req.startAsync(req, resp);
                 asyncContext.setTimeout(0);
-                resp.setContentType("text/plain;charset=UTF-8");
+                resp.setContentType("text/plain;charset=utf-8");
 
                 req.getInputStream().setReadListener(new ReadListener()
                 {

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I`
`94`	`94`	`{`
`95`	`95`	`AsyncContext asyncContext = req.startAsync(req, resp);`
`96`	`96`	`asyncContext.setTimeout(0);`
`97`		`- resp.setContentType("text/plain;charset=UTF-8");`
	`97`	`+ resp.setContentType("text/plain;charset=utf-8");`
`98`	`98`
`99`	`99`	`req.getInputStream().setReadListener(new ReadListener()`
`100`	`100`	`{`