This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 6ec5f15752 Fix handling of login-config merge conflict
6ec5f15752 is described below
commit 6ec5f1575293cbbd400da55006b6f086e6aa3daf
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 c4c0e250b9..1feef6666e 100644
--- a/java/org/apache/tomcat/util/descriptor/web/WebXml.java
+++ b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
@@ -2241,6 +2241,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 d90198a470..0a8822c969 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 11.0.25 (markt)" 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]
