This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 5043cdb02a Fix merge
5043cdb02a is described below
commit 5043cdb02a2996264ba8d70205d0e40b7abf90f0
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 ba6585a0ec..0c58c4402d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -321,7 +321,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>
@@ -338,10 +337,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]
