This is an automated email from the ASF dual-hosted git repository.
remm 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 9d103c8030 Fix changelog merges
9d103c8030 is described below
commit 9d103c8030dafe85f6fc46b58a1c91b5db189a37
Author: remm <[email protected]>
AuthorDate: Mon Sep 22 22:46:41 2025 +0200
Fix changelog merges
---
webapps/docs/changelog.xml | 38 ++++++++++++++++++++++++++------------
1 file changed, 26 insertions(+), 12 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 803ffb14cd..c671469e71 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,20 +105,8 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 10.1.47 (schultz)" rtext="in development">
-</section>
-<section name="Tomcat 10.1.46 (schultz)" rtext="release in progress">
<subsection name="Catalina">
<changelog>
- <update>
- Change the digest used to calculate strong ETags (if enabled) for the
- default Servlet from SHA-1 to SHA-256 to align with the recommendation
- in RFC 9110 that hash functions used to generate strong ETags should be
- collision resistant. (markt)
- </update>
- <fix>
- Correct a regression in the fix for <bug>69781</bug> that broke
- <code>FileStore</code>. (markt)
- </fix>
<fix>
HTTP methods are case-sensitive so always use case sensitive
comparisons
when comparing HTTP methods. (markt)
@@ -175,6 +163,32 @@
</changelog>
</subsection>
</section>
+<section name="Tomcat 10.1.46 (schultz)" rtext="2025-09-12">
+ <subsection name="Catalina">
+ <changelog>
+ <update>
+ Change the digest used to calculate strong ETags (if enabled) for the
+ default Servlet from SHA-1 to SHA-256 to align with the recommendation
+ in RFC 9110 that hash functions used to generate strong ETags should be
+ collision resistant. (markt)
+ </update>
+ <fix>
+ Correct a regression in the fix for <bug>69781</bug> that broke
+ <code>FileStore</code>. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <update>
+ Add hybrid PQC support to OpenSSL, based on code from
+ <code>mod_ssl</code>. Using this OpenSSL specific code path,
+ additional PQC certificates defined with type <code>MLDSA</code> are
+ added to contexts which use classic certificates. (jfclere/remm)
+ </update>
+ </changelog>
+ </subsection>
+</section>
<section name="Tomcat 10.1.45 (schultz)" rtext="2025-09-08">
<subsection name="Catalina">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
