tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1614289 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/Parser.java webapps/docs/changelog.xml
Date Tue, 29 Jul 2014 09:16:28 GMT
Author: markt
Date: Tue Jul 29 09:16:28 2014
New Revision: 1614289

URL: http://svn.apache.org/r1614289
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56612
Correctly parse {'\'\''} in JSPs

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.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=1614289&r1=1614288&r2=1614289&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul 29 09:16:28 2014
@@ -34,12 +34,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt, kkolinko
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56612
-  Correct parse {'\'\''} in JSPs
-  http://people.apache.org/~markt/patches/2014-06-11-bug56612-tc6-v1.patch
-  +1: markt, kkolinko, schultz
-  -1:
-
 * Use if/elseif for alternative branches.
   http://svn.apache.org/r1601909
   +1: kkolinko, markt, schultz

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java?rev=1614289&r1=1614288&r2=1614289&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java Tue Jul 29 09:16:28 2014
@@ -721,7 +721,7 @@ class Parser implements TagConstants {
             // XXX could move this logic to JspReader
             last = reader.mark(); // XXX somewhat wasteful
             currentChar = reader.nextChar();
-            if (currentChar == '\\' && (singleQuoted || doubleQuoted)) {
+            while (currentChar == '\\' && (singleQuoted || doubleQuoted)) {
                 // skip character following '\' within quotes
                 reader.nextChar();
                 currentChar = reader.nextChar();

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=1614289&r1=1614288&r2=1614289&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jul 29 09:16:28 2014
@@ -77,6 +77,10 @@
         <bug>56561</bug>: Avoid <code>NoSuchElementException</code>
while
         handling attributes with empty string value. (violetagg)
       </fix>
+      <fix>
+        <bug>56612</bug>: Correctly parse consecutive escaped single quotes when
+        used in an EL expression. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>



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


Mime
View raw message