This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new c2c57fb Expand Locale <-> charset mapping
c2c57fb is described below
commit c2c57fb17a3eaa8d4b89671fc36c03db511e79f3
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Jan 27 10:54:42 2022 +0000
Expand Locale <-> charset mapping
This particular mapping is now used by the TCK to test
ServletReponse.setLocale() so we need this to pass those tests.
---
java/org/apache/catalina/util/CharsetMapperDefault.properties | 1 +
webapps/docs/changelog.xml | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/java/org/apache/catalina/util/CharsetMapperDefault.properties
b/java/org/apache/catalina/util/CharsetMapperDefault.properties
index 6f8bf49..d438bcf 100644
--- a/java/org/apache/catalina/util/CharsetMapperDefault.properties
+++ b/java/org/apache/catalina/util/CharsetMapperDefault.properties
@@ -15,3 +15,4 @@
en=ISO-8859-1
fr=ISO-8859-1
+ja=Shift_JIS
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 303d8f7..2afd5bc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,11 @@
list of JARs to skip when scanning for TLDs, web fragments and
annotations. (michaelo)
</add>
+ <add>
+ Expand the default mappings used by
+ <code>ServletResponse.setLocale()</code> to include a mapping from the
+ <code>ja</code> locale to the <code>Shift_JIS</code> encoding. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
