Author: kkolinko
Date: Sun May  6 22:06:32 2018
New Revision: 1831061

URL: http://svn.apache.org/viewvc?rev=1831061&view=rev
Log:
Followup to the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=62273
Fix startup failure when running under SecurityManager.

The inner classes of HttpParser were changed in r1830313.

Modified:
    
tomcat/tc7.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

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=1831061&r1=1831060&r2=1831061&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 
Sun May  6 22:06:32 2018
@@ -191,7 +191,9 @@ 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.HttpParser$AllowsEnd");
+        loader.loadClass(basePackage + 
"util.http.parser.HttpParser$DomainParseState");
+        loader.loadClass(basePackage + 
"util.http.parser.HttpParser$SkipResult");
         loader.loadClass(basePackage + "util.http.parser.MediaType");
         loader.loadClass(basePackage + "util.http.parser.MediaTypeCache");
         // jni

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=1831061&r1=1831060&r2=1831061&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun May  6 22:06:32 2018
@@ -81,6 +81,10 @@
         saved request body. (markt)
       </fix>
       <fix>
+        Fix startup failure when running under SecurityManager, a regression
+        from the fix for bug <bug>62273</bug>. (kkolinko)
+      </fix>
+      <fix>
         <bug>62353</bug>: Correct a regression introduced in Tomcat 7.0.86.
         Restore the ability for Tomcat 7 to run on Java 6 where Common
         Annotations 1.0 is available. Document the requirement to use the Java



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to