Author: markt
Date: Wed May 30 19:44:55 2007
New Revision: 543026

URL: http://svn.apache.org/viewvc?view=rev&rev=543026
Log:
Port fix for bug 39425. Add additional permission required for precompiled JSPs.

Modified:
    tomcat/tc6.0.x/trunk/conf/catalina.policy
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/conf/catalina.policy
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/catalina.policy?view=diff&rev=543026&r1=543025&r2=543026
==============================================================================
--- tomcat/tc6.0.x/trunk/conf/catalina.policy (original)
+++ tomcat/tc6.0.x/trunk/conf/catalina.policy Wed May 30 19:44:55 2007
@@ -89,27 +89,30 @@
     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";
+
 };
 
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=543026&r1=543025&r2=543026
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed May 30 19:44:55 2007
@@ -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)



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to