Author: markt
Date: Wed Jun  1 11:18:45 2016
New Revision: 1746427

URL: http://svn.apache.org/viewvc?rev=1746427&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59604
Correct the assumption made in the URL decoding that the default platform 
encoding is always compatible with ISO-8859-1. This assumption is not always 
valid, e.g. on z/OS.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1746427&r1=1746426&r2=1746427&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Wed Jun  1 
11:18:45 2016
@@ -347,6 +347,7 @@ public final class UDecoder {
         try {
             if (enc == null) {
                 bytes = str.getBytes(StandardCharsets.ISO_8859_1);
+                enc = "ISO-8859-1";
             } else {
                 bytes = str.getBytes(B2CConverter.getCharset(enc));
             }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1746427&r1=1746426&r2=1746427&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jun  1 11:18:45 2016
@@ -67,6 +67,11 @@
         increase in the reports of memory leaks for some time. (markt)
       </scode>
       <fix>
+        <bug>59604</bug>: Correct the assumption made in the URL decoding that
+        the default platform encoding is always compatible with ISO-8859-1. 
This
+        assumption is not always valid, e.g. on z/OS. (markt)
+      </fix>
+      <fix>
         <bug>59608</bug>: Skip over any invalid <code>Class-Path</code> 
attribute
         from JAR manifests. Log errors at debug level due to many bad 
libraries.
         (remm)



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

Reply via email to