From daec492aa554baa4f8e5d7ec613178df7dd7664c Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 4 Feb 2011 11:07:18 +0000
Subject: [PATCH] Fix security exception when running under a SecurityManager

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1067147 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/security/SecurityClassLoad.java | 3 +++
 webapps/docs/changelog.xml                               | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/java/org/apache/catalina/security/SecurityClassLoad.java b/java/org/apache/catalina/security/SecurityClassLoad.java
index f444b9dd7..6bc480daf 100644
--- a/java/org/apache/catalina/security/SecurityClassLoad.java
+++ b/java/org/apache/catalina/security/SecurityClassLoad.java
@@ -131,6 +131,9 @@ public final class SecurityClassLoad {
             throws Exception {
         final String basePackage = "org.apache.coyote.";
         loader.loadClass(basePackage + "http11.AbstractOutputBuffer$1");
+        // Make sure system property is read at this point
+        Class<?> clazz = loader.loadClass(basePackage + "Constants");
+        clazz.newInstance();
     }
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a11110ffe..418f27bc2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -51,6 +51,10 @@
        <bug>50709</bug>: Make <code>ApplicationContextFacade</code> non-final to
        enable extension. (markt)
       </fix>
+      <fix>
+        When running under a security manager, user requests may fail with a
+        security exception. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">
-- 
2.11.0