tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From micha...@apache.org
Subject [tomcat] branch 8.5.x updated: Add more charsets to CharsetCache for the HPE JVM on HP-UX
Date Tue, 12 Nov 2019 16:00:09 GMT
This is an automated email from the ASF dual-hosted git repository.

michaelo 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 83bae8a  Add more charsets to CharsetCache for the HPE JVM on HP-UX
83bae8a is described below

commit 83bae8a582fbcb0d3702a708f9cd68e86d94b6e4
Author: Michael Osipov <michaelo@apache.org>
AuthorDate: Tue Nov 12 16:56:50 2019 +0100

    Add more charsets to CharsetCache for the HPE JVM on HP-UX
---
 java/org/apache/tomcat/util/buf/CharsetCache.java | 4 +++-
 webapps/docs/changelog.xml                        | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/buf/CharsetCache.java b/java/org/apache/tomcat/util/buf/CharsetCache.java
index 9234f07..2f09168 100644
--- a/java/org/apache/tomcat/util/buf/CharsetCache.java
+++ b/java/org/apache/tomcat/util/buf/CharsetCache.java
@@ -149,7 +149,9 @@ public class CharsetCache {
             "29626c", "833", "cp29626c", "ibm-1140", "ibm-1141", "ibm-1142", "ibm-1143",
"ibm-1144", "ibm-1145",
             "ibm-1146", "ibm-1147", "ibm-1148", "ibm-1149", "ibm-29626c", "ibm-858", "ibm-eucjp",
"ibm1140", "ibm1141",
             "ibm1142", "ibm1143", "ibm1144", "ibm1145", "ibm1146", "ibm1147", "ibm1148",
"ibm1149", "ibm29626c",
-            "ibm858", "x-ibm29626c"
+            "ibm858", "x-ibm29626c",
+            // Added from HPE JVM 1.8.0.17-hp-ux
+            "cp1051", "cp1386", "cshproman8", "hp-roman8", "ibm-1051", "r8", "roman8", "roman9"
             };
 
     private static final Charset DUMMY_CHARSET = new DummyCharset("Dummy",  null);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9d99328..8a5e592 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -189,6 +189,10 @@
         <bug>63838</bug>: Suppress reflexive access warnings when running the
         unit tests on the command line. (markt)
       </fix>
+      <fix>
+        Add missing charsets from the HPE JVM on HP-UX to pass unit tests in
+        <code>org.apache.tomcat.util.buf.TestCharsetCache</code>. (michaelo)
+      </fix>
       <add>
         Expand the coverage and quality of the French translations provided
         with Apache Tomcat. (remm)


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message