tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1347036 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/security/SecurityClassLoad.java webapps/docs/changelog.xml
Date Wed, 06 Jun 2012 18:32:43 GMT
Author: markt
Date: Wed Jun  6 18:32:43 2012
New Revision: 1347036

URL: http://svn.apache.org/viewvc?rev=1347036&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53366
New http header parser needs to be pre-loaded when running under a security manager

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:r1347034

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=1347036&r1=1347035&r2=1347036&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 Wed Jun
 6 18:32:43 2012
@@ -239,16 +239,36 @@ public final class SecurityClassLoad {
     private static final void loadTomcatPackage(ClassLoader loader)
         throws Exception {
         final String basePackage = "org.apache.tomcat.";
+        // buf
         loader.loadClass(basePackage + "util.buf.HexUtils");
         loader.loadClass(basePackage + "util.buf.StringCache");
         loader.loadClass(basePackage + "util.buf.StringCache$ByteEntry");
         loader.loadClass(basePackage + "util.buf.StringCache$CharEntry");
+        // http
         loader.loadClass(basePackage + "util.http.HttpMessages");
         // Make sure system property is read at this point
         Class<?> clazz = loader.loadClass(
                 basePackage + "util.http.FastHttpDateFormat");
         clazz.newInstance();
         loader.loadClass(basePackage + "util.http.HttpMessages");
+        loader.loadClass(basePackage + "util.http.parser.AstAttribute");
+        loader.loadClass(basePackage + "util.http.parser.AstMediaType");
+        loader.loadClass(basePackage + "util.http.parser.AstParameter");
+        loader.loadClass(basePackage + "util.http.parser.AstSubType");
+        loader.loadClass(basePackage + "util.http.parser.AstType");
+        loader.loadClass(basePackage + "util.http.parser.AstValue");
+        loader.loadClass(basePackage + "util.http.parser.HttpParser");
+        loader.loadClass(basePackage + "util.http.parser.HttpParserConstants");
+        loader.loadClass(basePackage + "util.http.parser.HttpParserTokenManager");
+        loader.loadClass(basePackage + "util.http.parser.HttpParserTreeConstants");
+        loader.loadClass(basePackage + "util.http.parser.JJTHttpParserState");
+        loader.loadClass(basePackage + "util.http.parser.Node");
+        loader.loadClass(basePackage + "util.http.parser.ParseException");
+        loader.loadClass(basePackage + "util.http.parser.SimpleCharStream");
+        loader.loadClass(basePackage + "util.http.parser.SimpleNode");
+        loader.loadClass(basePackage + "util.http.parser.Token");
+        loader.loadClass(basePackage + "util.http.parser.TokenMgrError");
+        // net
         loader.loadClass(basePackage + "util.net.Constants");
         loader.loadClass(basePackage +
                 "util.net.NioBlockingSelector$BlockPoller$1");

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=1347036&r1=1347035&r2=1347036&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jun  6 18:32:43 2012
@@ -211,6 +211,10 @@
         context root of a web application. (markt)
       </fix>
       <fix>
+        <bug>53366</bug>: Ensure new HTTP header parser works correctly when
+        running Tomcat under a security manager. (markt/kkolinko)
+      </fix>
+      <fix>
         <bug>53230</bug>: Changed ManagerBase to throw
         TooManyActiveSessionsException instead of IllegalStateException
         when the maximum number of sessions has been exceeded and a new



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


Mime
View raw message