Port fix for bug 39425. Add additional permission required for precompiled JSPs.

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

diff --git a/conf/catalina.policy b/conf/catalina.policy
index c1850a9..c7e1d70 100644 (file)
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -89,27 +89,30 @@ grant {
     permission java.util.PropertyPermission "java.vendor", "read";
     permission java.util.PropertyPermission "java.vendor.url", "read";
     permission java.util.PropertyPermission "java.class.version", "read";
-       permission java.util.PropertyPermission "java.specification.version", "read";
-       permission java.util.PropertyPermission "java.specification.vendor", "read";
-       permission java.util.PropertyPermission "java.specification.name", "read";
+    permission java.util.PropertyPermission "java.specification.version", "read";
+    permission java.util.PropertyPermission "java.specification.vendor", "read";
+    permission java.util.PropertyPermission "java.specification.name", "read";
 
-       permission java.util.PropertyPermission "java.vm.specification.version", "read";
-       permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
-       permission java.util.PropertyPermission "java.vm.specification.name", "read";
-       permission java.util.PropertyPermission "java.vm.version", "read";
-       permission java.util.PropertyPermission "java.vm.vendor", "read";
-       permission java.util.PropertyPermission "java.vm.name", "read";
+    permission java.util.PropertyPermission "java.vm.specification.version", "read";
+    permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
+    permission java.util.PropertyPermission "java.vm.specification.name", "read";
+    permission java.util.PropertyPermission "java.vm.version", "read";
+    permission java.util.PropertyPermission "java.vm.vendor", "read";
+    permission java.util.PropertyPermission "java.vm.name", "read";
 
     // Required for OpenJMX
     permission java.lang.RuntimePermission "getAttribute";
 
-       // Allow read of JAXP compliant XML parser debug
-       permission java.util.PropertyPermission "jaxp.debug", "read";
+    // Allow read of JAXP compliant XML parser debug
+    permission java.util.PropertyPermission "jaxp.debug", "read";
 
     // Precompiled JSPs need access to this package.
     permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime";
     permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime.*";
     
+    // Precompiled JSPs need access to this system property.
+    permission java.util.PropertyPermission "org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER", "read";
+
 };
 
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b3a8c32..9951701 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -43,6 +43,10 @@
   <subsection name="Jasper">
     <changelog>
       <fix>
+        <bug>39425</bug> Add additional system property permission to
+        catalina.policy for pre-compiled JSPs. (markt)
+      </fix>
+      <fix>
         <bug>42438</bug> Duplicate temporary variables were created when
         jsp:attribute was used in conjunction with custom tags. Patch provided
         by Brian Lenz. (markt)