Author: kkolinko
Date: Mon May 12 13:21:09 2014
New Revision: 1593963
URL: http://svn.apache.org/r1593963
Log:
Clean-up and add additional packages
It is backport of r1593262, r1593285
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/conf/catalina.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1593259,1593261
Merged /tomcat/tc7.0.x/trunk:r1593262
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1593963&r1=1593962&r2=1593963&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 12 13:21:09 2014
@@ -28,12 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Clean-up and add additional packages
- https://svn.apache.org/r1593262
- https://svn.apache.org/r1593285
- +1: markt, kkolinko, fhanik
- -1:
-
* Extend token protection to either access option in NamingContextListener
https://svn.apache.org/r1593288
https://svn.apache.org/r1593371
Modified: tomcat/tc6.0.x/trunk/conf/catalina.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/catalina.properties?rev=1593963&r1=1593962&r2=1593963&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/conf/catalina.properties (original)
+++ tomcat/tc6.0.x/trunk/conf/catalina.properties Mon May 12 13:21:09 2014
@@ -19,7 +19,8 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,\
+org.apache.naming.resources.,org.apache.tomcat.,sun.beans.
#
# List of comma-separated packages that start with or equal this string
# will cause a security exception to be thrown when
@@ -30,7 +31,8 @@ package.access=sun.,org.apache.catalina.
# by default, no packages are restricted for definition, and none of
# the class loaders supplied with the JDK call checkPackageDefinition.
#
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
+org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
#
#
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?rev=1593963&r1=1593962&r2=1593963&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon May 12 13:21:09 2014
@@ -104,6 +104,16 @@
additional locations where, theoretically, a memory leak could occur.
(markt)
</add>
+ <add>
+ Add the <code>org.apache.naming</code> package to the packages
requiring
+ code to have the <code>defineClassInPackage</code> permission when
+ running under a security manager. (markt)
+ </add>
+ <add>
+ Add the <code>org.apache.naming.resources</code> package to the
packages
+ requiring code to have the <code>accessClassInPackage</code> permission
+ when running under a security manager. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
