From 02fd0d3df66ac03e9015164eb945c1f290e6324e Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 7 Jun 2011 23:48:17 +0000 Subject: [PATCH] Correct a regression in the fix for bug 51278 that prevented any web application from being marked as distributable. (kfujino) git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1133201 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/startup/ContextConfig.java | 4 ++++ webapps/docs/changelog.xml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java index 3bf5fffb1..dad56e387 100644 --- 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 ec7cb8659..72f3b9b74 100644 --- 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) + + Correct a regression in the fix for 51278 that prevented any + web application from being marked as distributable. (kfujino/mark) + -- 2.11.0