Correct a regression in the fix for bug 51278 that prevented any web application...

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

diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index 3bf5fff..dad56e3 100644 (file)
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -1195,6 +1195,10 @@ public class ContextConfig
          */ 
         WebXml webXmlDefaultFragment = createWebXml();
         webXmlDefaultFragment.setOverridable(true);
+        // Set to distributable else every app will be prevented from being
+        // distributable when the default fragment is merged with the main
+        // web.xml
+        webXmlDefaultFragment.setDistributable(true);
 
         // Parse global web.xml if present
         InputSource globalWebXml = getGlobalWebXmlSource();

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ec7cb86..72f3b9b 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -55,6 +55,10 @@
         response buffer to ensure that the doFlush flag does not get stuck in
         the enabled state. Patch provided by Jeremy Norris. (markt)
       </fix>
+      <fix>
+        Correct a regression in the fix for <bug>51278</bug> that prevented any
+        web application from being marked as distributable. (kfujino/mark)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">