Author: kkolinko
Date: Wed Jan 27 09:06:14 2010
New Revision: 903572
URL: http://svn.apache.org/viewvc?rev=903572&view=rev
Log:
Pre-load class required to obtain SSL key size if running under a security
manager
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/security/SecurityClassLoad.java
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=903572&r1=903571&r2=903572&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Jan 27 09:06:14 2010
@@ -174,12 +174,6 @@
+1: markt, rjung
-1:
-* Pre-load class required to obtain SSL key size if running under a security
- manager
- http://svn.apache.org/viewvc?rev=890349&view=rev
- +1: markt, rjung, kkolinko
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47744
Prevent medium term memory leak if using SSL under a security manager
Based on a patch by Greg Vanore
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/security/SecurityClassLoad.java?rev=903572&r1=903571&r2=903572&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/security/SecurityClassLoad.java
Wed Jan 27 09:06:14 2010
@@ -44,6 +44,7 @@
loadJavaxPackage(loader);
loadCoyotePackage(loader);
loadHttp11Package(loader);
+ loadTomcatPackage(loader);
}
@@ -201,5 +202,10 @@
"Response$3");
}
+ private final static void loadTomcatPackage(ClassLoader loader)
+ throws Exception {
+ String basePackage = "org.apache.tomcat.";
+ loader.loadClass(basePackage + "util.net.SSLSupport$CipherData");
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
