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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to