This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 62b620eee0 Fix handling of login-config merge conflict
62b620eee0 is described below
commit 62b620eee03f42a5313016fc24b8209a88b7e919
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 | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/java/org/apache/tomcat/util/descriptor/web/WebXml.java
b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
index 108c8e0191..952e5ef6dc 100644
--- a/java/org/apache/tomcat/util/descriptor/web/WebXml.java
+++ b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
@@ -2248,6 +2248,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 0a38fadd01..06b1344576 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -231,6 +231,10 @@
Saavedra. (markt)
</add>
<!-- Entries for backport and removal before 12.0.0-M1 below this line
-->
+ <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">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
