svn commit: r708124 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ssi/SSIMediator.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Oct 27 03:07:07 2008
New Revision: 708124

URL: http://svn.apache.org/viewvc?rev=708124&view=rev
Log:
Fix HTML decoding bug reported by Find Bugs

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=708124&r1=708123&r2=708124&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Oct 27 03:07:07 2008
@@ -151,11 +151,6 @@
   +1: markt,fhanik
   -1: 
 
-* Fix HTML decoding bug found by Find Bugs
-  http://svn.apache.org/viewvc?rev=699635&view=rev
-  +1: markt, remm,fhanik
-  -1: 
-
 * Fix ASCII parsing bug found by Find Bugs
   http://svn.apache.org/viewvc?rev=699644&view=rev
   +1: markt, remm,fhanik

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java?rev=708124&r1=708123&r2=708124&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java Mon Oct 
27 03:07:07 2008
@@ -211,10 +211,10 @@
         if (val.indexOf('$') < 0 && val.indexOf('&') < 0) return val;
         
         // HTML decoding
-        val.replace("&lt;", "<");
-        val.replace("&gt;", ">");
-        val.replace("&quot;", "\"");
-        val.replace("&amp;", "&");
+        val = val.replace("&lt;", "<");
+        val = val.replace("&gt;", ">");
+        val = val.replace("&quot;", "\"");
+        val = val.replace("&amp;", "&");
 
         StringBuffer sb = new StringBuffer(val);
         int charStart = sb.indexOf("&#");

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=708124&r1=708123&r2=708124&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Oct 27 03:07:07 2008
@@ -107,6 +107,9 @@
         since the default of <code>cacheMaxSize/20</code> gave too high a value
         for large caches. (markt)
       </add>
+      <fix>
+        Fix HTML decoding error in SSI processing. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]