svn commit: r1521080 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/security/SecurityClassLoad.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Sep  9 12:54:02 2013
New Revision: 1521080

URL: http://svn.apache.org/r1521080
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55019
Fix an exception that occurs when accessing certain JSP pages when running with 
a SecurityManager. (jfclere)

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1521080&r1=1521079&r2=1521080&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep  9 12:54:02 2013
@@ -32,14 +32,6 @@ PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55019
-  Fix an exception that occurs when accessing certain JSP page when running
-  with SecurityManager
-  patch in the issue (in SecurityClassLoad).
-  https://issues.apache.org/bugzilla/attachment.cgi?id=30336
-  +1: jfclere, remm, kkolinko, schultz
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54947
   http://svn.apache.org/r1486877
   NIO connector incorrectly rejects a request if the CRLF terminating the

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1521080&r1=1521079&r2=1521080&view=diff
==============================================================================
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
Mon Sep  9 12:54:02 2013
@@ -121,6 +121,7 @@ public final class SecurityClassLoad {
         String basePackage = "org.apache.coyote.http11.";
         loader.loadClass(basePackage + "InternalOutputBuffer$1");
         loader.loadClass(basePackage + "InternalOutputBuffer$2");
+        loader.loadClass(basePackage + "Constants");
     }
     
     

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1521080&r1=1521079&r2=1521080&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Sep  9 12:54:02 2013
@@ -49,7 +49,11 @@
       <fix>
         Ensure that when Tomcat&apos;s anti-resource locking features are used
         that the temporary copy of the web application and not the original is
-        removed when the web application stops. (markt) 
+        removed when the web application stops. (markt/kkolinko) 
+      </fix>
+      <fix>
+        <bug>55019</bug>: Fix a potential exception when accessing JSPs while
+        running under a SecurityManager. (jfclere)
       </fix>
     </changelog>
   </subsection>



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