tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1574809 - in /tomcat/trunk/java/org/apache/jasper: Constants.java servlet/JspCServletContext.java
Date Thu, 06 Mar 2014 08:58:32 GMT
Author: markt
Date: Thu Mar  6 08:58:31 2014
New Revision: 1574809

URL: http://svn.apache.org/r1574809
Log:
Follow up to r1574785
- Ensure blockExternal init param is set
- Remove unused constant

Modified:
    tomcat/trunk/java/org/apache/jasper/Constants.java
    tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java

Modified: tomcat/trunk/java/org/apache/jasper/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/Constants.java?rev=1574809&r1=1574808&r2=1574809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/trunk/java/org/apache/jasper/Constants.java Thu Mar  6 08:58:31 2014
@@ -162,16 +162,6 @@ public class Constants {
             "org.apache.jasper.XML_VALIDATE_TLD";
 
     /**
-     * Name of the ServletContext init-param that determines if the XML parser
-     * used for web.xml files will be validating or not. Note that this is only
-     * used when using JspC. In normal operation, Jasper obtains the JspConfig
-     * information directly from the ServletContext and therefore does not need
-     * to parse web.xml.
-     */
-    public static final String XML_VALIDATION_INIT_PARAM =
-            "org.apache.jasper.XML_VALIDATE";
-
-    /**
      * Name of the ServletContext init-param that determines if the XML parsers
      * will block the resolution of external entities.
      * <p>

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1574809&r1=1574808&r2=1574809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Thu Mar  6 08:58:31
2014
@@ -45,6 +45,7 @@ import javax.servlet.SessionCookieConfig
 import javax.servlet.SessionTrackingMode;
 import javax.servlet.descriptor.JspConfigDescriptor;
 
+import org.apache.jasper.Constants;
 import org.apache.jasper.JasperException;
 import org.apache.jasper.compiler.Localizer;
 import org.apache.jasper.util.ExceptionUtils;
@@ -126,6 +127,8 @@ public class JspCServletContext implemen
 
         myAttributes = new HashMap<>();
         myParameters = new ConcurrentHashMap<>();
+        myParameters.put(Constants.XML_BLOCK_EXTERNAL_INIT_PARAM,
+                String.valueOf(blockExternal));
         myLogWriter = aLogWriter;
         myResourceBaseURL = aResourceBaseURL;
         this.loader = classLoader;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message