Author: markt
Date: Sat Jan 31 08:59:08 2009
New Revision: 739527
URL: http://svn.apache.org/viewvc?rev=739527&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=36923
If EL is disabled, treat it as template text
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
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
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 31 08:59:08 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729809,729815,729934,730250,732859
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729809,729815,729934,730250,730590,732859
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=739527&r1=739526&r2=739527&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jan 31 08:59:08 2009
@@ -126,12 +126,6 @@
0: funkman - ditto
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=36923
- If EL is disabled, treat it as template text
- http://svn.apache.org/viewvc?rev=730590&view=rev
- +1: markt, funkman, remm
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46471
Use jar url and tag file path to uniquely ID a tag file to prevent naming
clashes
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=739527&r1=739526&r2=739527&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 Sat Jan 31
08:59:08 2009
@@ -1313,7 +1313,7 @@
if (ch == '<') {
reader.pushChar();
break;
- } else if (ch == '$' || ch == '#') {
+ } else if ((ch == '$' || ch == '#') && !pageInfo.isELIgnored()) {
if (!reader.hasMoreInput()) {
ttext.write(ch);
break;
@@ -1453,9 +1453,9 @@
parseXMLScriptlet(parent);
} else if (reader.matches("<jsp:text")) {
parseXMLTemplateText(parent);
- } else if (reader.matches("${")) {
+ } else if (reader.matches("${") && !pageInfo.isELIgnored()) {
parseELExpression(parent, '$');
- } else if (reader.matches("#{")) {
+ } else if (reader.matches("#{") && !pageInfo.isELIgnored()) {
parseELExpression(parent, '#');
} else if (reader.matches("<jsp:")) {
parseStandardAction(parent);
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=739527&r1=739526&r2=739527&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Jan 31 08:59:08 2009
@@ -322,6 +322,10 @@
<subsection name="Jasper">
<changelog>
<fix>
+ <bug>36923</bug>: Treat EL expressions as template text is EL
+ expressions are disabled. (markt)
+ </fix>
+ <fix>
<bug>37515</bug>: Support 1.6 and 1.7 as source and target for
compilation. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
