From 46d507f395c15b9ecb917e5f90bf14ad0a1ccfb2 Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 31 May 2007 02:44:55 +0000 Subject: [PATCH] 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 --- conf/catalina.policy | 25 ++++++++++++++----------- webapps/docs/changelog.xml | 4 ++++ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/conf/catalina.policy b/conf/catalina.policy index c1850a963..c7e1d7025 100644 --- 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 b3a8c3269..9951701e3 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -43,6 +43,10 @@ + 39425 Add additional system property permission to + catalina.policy for pre-compiled JSPs. (markt) + + 42438 Duplicate temporary variables were created when jsp:attribute was used in conjunction with custom tags. Patch provided by Brian Lenz. (markt) -- 2.11.0