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 d87e64d3f1 Revert the ja <-> Shift_JIS mapping d87e64d3f1 is described below commit d87e64d3f107c5040b516c3c3dccea017bf793ba Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Apr 28 19:26:24 2022 +0100 Revert the ja <-> Shift_JIS mapping --- java/org/apache/catalina/util/CharsetMapperDefault.properties | 1 - webapps/docs/changelog.xml | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/util/CharsetMapperDefault.properties b/java/org/apache/catalina/util/CharsetMapperDefault.properties index d438bcf71e..6f8bf49493 100644 --- a/java/org/apache/catalina/util/CharsetMapperDefault.properties +++ b/java/org/apache/catalina/util/CharsetMapperDefault.properties @@ -15,4 +15,3 @@ en=ISO-8859-1 fr=ISO-8859-1 -ja=Shift_JIS diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b17701fa92..ed9063ff7b 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -118,6 +118,12 @@ retrieve a certificate DN, to match the output of the deprecated <code>getSubjectDN().getName()</code> that was used previously. (remm) </fix> + <add> + Revert the change in 8.5.76 that added a mapping of + <code>Shift_JIS</code> for the <code>ja</code> locale to the default + mappings used by <code>ServletResponse.setLocale()</code> as it + caused regressions for applications using UTF-8. (markt) + </add> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org