From 38099944c9f6863ddd6c13e22795268e5e6129b8 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 23 Aug 2010 17:32:03 +0000
Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49750
 Align WebappClassLoader.validate() implementation with Javadoc and ensure
 that javax.servlet.* classes can not be loaded by a WebappClassLoader
 instance. Patch provided by pid.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@988222 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/loader/WebappClassLoader.java | 2 ++
 webapps/docs/changelog.xml                             | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java
index e298360dd..2d8d13ff7 100644
--- a/java/org/apache/catalina/loader/WebappClassLoader.java
+++ b/java/org/apache/catalina/loader/WebappClassLoader.java
@@ -3206,6 +3206,8 @@ public class WebappClassLoader
             return false;
         if (name.startsWith("java."))
             return false;
+        if (name.startsWith("javax.servlet."))
+            return false;
 
         return true;
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 17ad10609..0cd5ebf14 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -47,6 +47,12 @@
         distributable element of web.xml. (kfujino)
       </fix>
       <fix>
+        <bug>47950</bug>: Align <code>WebappClassLoader.validate()</code>
+        implementation with Javadoc and ensure that <code>javax.servlet.*</code>
+        classes can not be loaded by a <code>WebappClassLoader</code> instance.
+        Patch provided by pid. (markt)
+      </fix>
+      <fix>
         <bug>49757</bug>: Correct some generics warnings. Based on a patch
         provided by Gábor. (markt)
       </fix>
-- 
2.11.0