Author: kkolinko
Date: Mon May 26 14:14:18 2014
New Revision: 1597592
URL: http://svn.apache.org/r1597592
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56545
Pre-load an additional class if running under a security manager
It is merge of r1596141 from tomcat/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1596141
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1597592&r1=1597591&r2=1597592&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Mon May 26 14:14:18 2014
@@ -272,6 +272,7 @@ public final class SecurityClassLoad {
clazz.newInstance();
loader.loadClass(basePackage + "util.http.HttpMessages");
loader.loadClass(basePackage + "util.http.parser.HttpParser");
+ loader.loadClass(basePackage +
"util.http.parser.HttpParser$SkipConstantResult");
loader.loadClass(basePackage + "util.http.parser.MediaType");
loader.loadClass(basePackage + "util.http.parser.MediaTypeCache");
// net
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1597592&r1=1597591&r2=1597592&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon May 26 14:14:18 2014
@@ -68,6 +68,11 @@
optionally interrupt stuck threads to attempt to unblock them.
(slaurent)
</add>
+ <fix>
+ <bug>56545</bug>: Pre-load an additional class, the loading of which
+ may otherwise be triggered by a web application which in turn would
+ trigger an exception when running under a security manager. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
