From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 31 Oct 2006 12:53:43 +0000 (+0000)
Subject: - Add two allowed directives.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=96c8c2a3ca02bfa54fec8f14a4956867b48c70fe;p=tomcat7.0

- Add two allowed directives.

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

diff --git a/java/org/apache/jasper/compiler/TagFileProcessor.java b/java/org/apache/jasper/compiler/TagFileProcessor.java
index 86f83c81a..c048bd3cc 100644
--- a/java/org/apache/jasper/compiler/TagFileProcessor.java
+++ b/java/org/apache/jasper/compiler/TagFileProcessor.java
@@ -68,6 +68,8 @@ class TagFileProcessor {
                 new JspUtil.ValidAttribute("pageEncoding"),
                 new JspUtil.ValidAttribute("language"),
                 new JspUtil.ValidAttribute("import"),
+                new JspUtil.ValidAttribute("deferredSyntaxAllowedAsLiteral"), // JSP 2.1
+                new JspUtil.ValidAttribute("trimDirectiveWhitespaces"), // JSP 2.1
                 new JspUtil.ValidAttribute("isELIgnored") };
 
         private static final JspUtil.ValidAttribute[] attributeDirectiveAttrs = {