glenn 01/11/25 13:06:23
Modified: catalina/src/share/org/apache/catalina/loader
WebappLoader.java
Log:
Tomcat 4 Java SecurityManager updates:
Removed granting AllPermission to privileged webapps within Tomcat
and moved back out into catalina.policy.
Wrapped ContainerBase.addChild() with a doPrivileged to keep instances
of Tomcat which use a very strict security policy happy.
Revision Changes Path
1.19 +4 -9
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
Index: WebappLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- WebappLoader.java 2001/11/09 19:39:34 1.18
+++ WebappLoader.java 2001/11/25 21:06:23 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
1.18 2001/11/09 19:39:34 remm Exp $
- * $Revision: 1.18 $
- * $Date: 2001/11/09 19:39:34 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
1.19 2001/11/25 21:06:23 glenn Exp $
+ * $Revision: 1.19 $
+ * $Date: 2001/11/25 21:06:23 $
*
* ====================================================================
*
@@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.18 $ $Date: 2001/11/09 19:39:34 $
+ * @version $Revision: 1.19 $ $Date: 2001/11/25 21:06:23 $
*/
public class WebappLoader
@@ -808,11 +808,6 @@
return;
if (!(container instanceof Context))
return;
-
- if (((Context) container).getPrivileged()) {
- classLoader.addPermission(new java.security.AllPermission());
- return;
- }
// Tell the class loader the root of the context
ServletContext servletContext =
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
