isELIgnored depends on library version and web.xml declaration

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@920110 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/compiler/Validator.java b/java/org/apache/jasper/compiler/Validator.java
index 8489e55..fd6b245 100644 (file)
--- a/java/org/apache/jasper/compiler/Validator.java
+++ b/java/org/apache/jasper/compiler/Validator.java
@@ -1077,12 +1077,15 @@ class Validator {
                 boolean deferred = false;
                 double libraryVersion = Double.parseDouble(
                         tagInfo.getTagLibrary().getRequiredVersion());
+                boolean elIgnored =
+                    pageInfo.isELIgnored() ||
+                    libraryVersion < 2.0;
                 boolean deferredSyntaxAllowedAsLiteral =
                     pageInfo.isDeferredSyntaxAllowedAsLiteral() ||
                     libraryVersion < 2.1;
 
                 ELNode.Nodes el = null;
-                if (!runtimeExpression && !pageInfo.isELIgnored()) {
+                if (!runtimeExpression && !elIgnored) {
                     el = ELParser.parse(attrs.getValue(i),
                             deferredSyntaxAllowedAsLiteral);
                     Iterator<ELNode> nodes = el.iterator();