tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r698923 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/Parser.java webapps/docs/changelog.xml
Date Thu, 25 Sep 2008 10:58:15 GMT
Author: markt
Date: Thu Sep 25 03:58:15 2008
New Revision: 698923

URL: http://svn.apache.org/viewvc?rev=698923&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45427
Correct parsing of quoted stings in EL

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=698923&r1=698922&r2=698923&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 03:58:15 2008
@@ -115,7 +115,7 @@
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44382
   Use HttpOnly for session cookies. This is enabled by default. Feel free to
-  caveat you vote with a preference for disabled by default.
+  caveat your vote with a preference for disabled by default.
   http://svn.apache.org/viewvc?rev=694992&view=rev
   +1: mark (prefer enabled, happy with disabled), rjung
    0: remm (not so elegant, not sure about default value)
@@ -137,12 +137,6 @@
              look into them as separate issues.
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45427
-  Correct parsing of quoted stings in EL
-  http://svn.apache.org/viewvc?rev=696278&view=rev
-  +1: markt, remm, mturk
-  -1: 
-
 * Allow asynchronous close() and setTimeout() on CometEvents
   http://svn.apache.org/viewvc?view=rev&revision=645175
   +1: fhanik

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=698923&r1=698922&r2=698923&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 Thu Sep 25 03:58:15 2008
@@ -27,7 +27,6 @@
 import javax.servlet.jsp.tagext.TagInfo;
 import javax.servlet.jsp.tagext.TagLibraryInfo;
 
-import org.apache.jasper.Constants;
 import org.apache.jasper.JasperException;
 import org.apache.jasper.JspCompilationContext;
 import org.xml.sax.Attributes;
@@ -772,9 +771,9 @@
             }
             if (currentChar == -1)
                 err.jspError(start, "jsp.error.unterminated", type + "{");
-            if (currentChar == '"')
+            if (currentChar == '"' && !singleQuoted)
                 doubleQuoted = !doubleQuoted;
-            if (currentChar == '\'')
+            if (currentChar == '\'' && !doubleQuoted)
                 singleQuoted = !singleQuoted;
         } while (currentChar != '}' || (singleQuoted || doubleQuoted));
 

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=698923&r1=698922&r2=698923&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Sep 25 03:58:15 2008
@@ -111,6 +111,10 @@
         Correct typo in JSP EL examples. (markt)
       </fix>
       <fix>
+        <bug>45427</bug>: Correctly handle unmatched quotes in EL expressions.
+        (markt)
+      </fix>
+      <fix>
         <bug>45511</bug>: The failure of the <code>empty</code> keyword
was a
         regression caused by the previous fix for <bug>42565</bug>. The original
         fix for <bug>42565</bug> has been reverted and a new fix applied.



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


Mime
View raw message