You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/02/08 03:00:59 UTC
svn commit: r907538 -
/tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
Author: markt
Date: Mon Feb 8 02:00:58 2010
New Revision: 907538
URL: http://svn.apache.org/viewvc?rev=907538&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
Don't look for EL matches (which swallow the EL match string) if EL is not enabled
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Parser.java?rev=907538&r1=907537&r2=907538&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Mon Feb 8 02:00:58 2010
@@ -1413,9 +1413,9 @@
parseXMLScriptlet(parent);
} else if (reader.matches("<jsp:text")) {
parseXMLTemplateText(parent);
- } else if (reader.matches("${") && !pageInfo.isELIgnored()) {
+ } else if (!pageInfo.isELIgnored() && reader.matches("${")) {
parseELExpression(parent, '$');
- } else if (reader.matches("#{") && !pageInfo.isELIgnored()) {
+ } else if (!pageInfo.isELIgnored() && reader.matches("#{")) {
parseELExpression(parent, '#');
} else if (reader.matches("<jsp:")) {
parseStandardAction(parent);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r907538 - /tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
Posted by Mark Thomas <ma...@apache.org>.
On 08/02/2010 12:49, Konstantin Kolinko wrote:
> 2010/2/8 <ma...@apache.org>:
>> Author: markt
>> Date: Mon Feb 8 02:00:58 2010
>> New Revision: 907538
>>
>> URL: http://svn.apache.org/viewvc?rev=907538&view=rev
>> Log:
>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
>> Don't look for EL matches (which swallow the EL match string) if EL is not enabled
>>
>> Modified:
>> tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
>>
>
>> - } else if (reader.matches("${") && !pageInfo.isELIgnored()) {
>> + } else if (!pageInfo.isELIgnored() && reader.matches("${")) {
>> parseELExpression(parent, '$');
>> - } else if (reader.matches("#{") && !pageInfo.isELIgnored()) {
>> + } else if (!pageInfo.isELIgnored() && reader.matches("#{")) {
>> parseELExpression(parent, '#');
>> } else if (reader.matches("<jsp:")) {
>
> For the "#{" expression the deferredSyntaxAllowedAsLiteral option
> should be taken care as well.
I wrote the 48668b.jsp[ test case explicitly to check for that and it is
already correctly handled.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r907538 - /tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
Posted by Konstantin Kolinko <kn...@gmail.com>.
2010/2/8 <ma...@apache.org>:
> Author: markt
> Date: Mon Feb 8 02:00:58 2010
> New Revision: 907538
>
> URL: http://svn.apache.org/viewvc?rev=907538&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
> Don't look for EL matches (which swallow the EL match string) if EL is not enabled
>
> Modified:
> tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
>
> - } else if (reader.matches("${") && !pageInfo.isELIgnored()) {
> + } else if (!pageInfo.isELIgnored() && reader.matches("${")) {
> parseELExpression(parent, '$');
> - } else if (reader.matches("#{") && !pageInfo.isELIgnored()) {
> + } else if (!pageInfo.isELIgnored() && reader.matches("#{")) {
> parseELExpression(parent, '#');
> } else if (reader.matches("<jsp:")) {
For the "#{" expression the deferredSyntaxAllowedAsLiteral option
should be taken care as well.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org