This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new 286e574b45 Add support for gb18030-2022 introduced in Java 21 286e574b45 is described below commit 286e574b45b618ead723427ba82fa3fda8e5dcf7 Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Apr 20 08:51:40 2023 +0100 Add support for gb18030-2022 introduced in Java 21 --- java/org/apache/tomcat/util/buf/CharsetCache.java | 4 +++- webapps/docs/changelog.xml | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/buf/CharsetCache.java b/java/org/apache/tomcat/util/buf/CharsetCache.java index 4474bee3c9..b26033bb1f 100644 --- a/java/org/apache/tomcat/util/buf/CharsetCache.java +++ b/java/org/apache/tomcat/util/buf/CharsetCache.java @@ -153,7 +153,9 @@ public class CharsetCache { // Added from OpenJDK 15 ea24 "iso8859_16", // Added from HPE JVM 1.8.0.17-hp-ux - "cp1051", "cp1386", "cshproman8", "hp-roman8", "ibm-1051", "r8", "roman8", "roman9" + "cp1051", "cp1386", "cshproman8", "hp-roman8", "ibm-1051", "r8", "roman8", "roman9", + // Added from OpenJDK 21 ea18 + "gb18030-2022" // If you add and entry to this list, ensure you run // TestCharsetUtil#testIsAcsiiSupersetAll() }; diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 4d4f471e22..f31545789f 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -113,6 +113,14 @@ </fix> </changelog> </subsection> + <subsection name="Coyote"> + <changelog> + <add> + Add support for a new character set, <code>gb18030-2022</code> - + introduced in Java 21, to the character set caching mechanism. (markt) + </add> + </changelog> + </subsection> </section> <section name="Tomcat 8.5.88 (schultz)" rtext="release in progress"> <subsection name="Catalina"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org