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 14622d1a8a Fix merge
14622d1a8a is described below
commit 14622d1a8a77047e0a145af37ac1e2f3aed11d90
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Nov 6 14:54:18 2026 +0000
Fix merge
---
webapps/docs/changelog.xml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c2c4585a60..5d8a09f3f6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -501,7 +501,6 @@
pools to share the same name. (remm)
</fix>
<fix>
-<<<<<<< HEAD
Use RequestDispatcher target rather than source when looking up
<code>security-role-ref</code>s for the current Servlet. (markt)
</fix>
@@ -518,10 +517,10 @@
<fix>
Align LockoutRealm with some Realm implementations and ignore leading
and trailing space in user names by default. (markt)
-=======
+ </fix>
+ <fix>
<code>ExpiresFilter</code> now takes account of headers set by a
previous filter in the filter chain. (markt)
->>>>>>> 4908896a8e (Take account of headers set in a previous filter)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
