Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50063

Fix apps with meta-data complete returning 404s

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1006265 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index 68ff9c4..1900fa3 100644 (file)
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -1281,6 +1281,7 @@ public class ContextConfig
                     }
                 }
             } else {
+                webXml.configureContext(context);
                 ok = true;
             }
             

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9175867..33b1767 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,11 @@
         <bug>50059</bug>: JARs should always be searched for static resources
         even if the web application is marked as meta-data complete. (markt)
       </fix>
+      <fix>
+        <bug>500063</bug>: Correct regression in fix for <bug>50059</bug> that
+        causes applications marked as meta-data complete to return 404s for all
+        requests. Patch provided by heyoulin. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">