This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 75339c48a0 Fix handling of login-config merge conflict
75339c48a0 is described below
commit 75339c48a0236135d244ed730fa4d561d80b372d
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Jul 6 11:21:54 2026 +0100
Fix handling of login-config merge conflict
---
java/org/apache/tomcat/util/descriptor/web/WebXml.java | 1 +
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 9 insertions(+)
diff --git a/java/org/apache/tomcat/util/descriptor/web/WebXml.java
b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
index 2d3c7cda5e..3417f54a70 100644
--- a/java/org/apache/tomcat/util/descriptor/web/WebXml.java
+++ b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
@@ -2207,6 +2207,7 @@ public class WebXml extends XmlEncodingBase implements
DocumentProperties.Charse
} else {
log.error(
sm.getString("webXml.mergeConflictLoginConfig", fragment.getName(),
fragment.getURL()));
+ return false;
}
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5d8207eb93..c4f877216c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -108,6 +108,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 9.0.121 (remm)" rtext="in development">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Ensure that a <code>login-config</code> conflict when merging web.xml
+ fragments triggers a deployment failure. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Coyote">
<changelog>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
