This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 77c10f2ce0a46dbce1a3b6ebf5e0a010be54eb95
Author: remm <r...@apache.org>
AuthorDate: Tue Oct 22 12:10:38 2024 +0200
Fix changelog
---
webapps/docs/changelog.xml | 34 +++++++++++-----------------------
1 file changed, 11 insertions(+), 23 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index edcaff8886..f68aa7679e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -107,31 +107,10 @@
<section name="Tomcat 9.0.97 (remm)" rtext="in development">
<subsection name="Catalina">
<changelog>
-<<<<<<< HEAD
-=======
<add>
Add support for the new Servlet API method
<code>HttpServletResponse.sendEarlyHints()</code>. (markt)
</add>
- <update>
- Remove default value (was <code>catalina</code>) for the
- <code>secret</code> init parameter of the WebDAV Servlet. (remm)
- </update>
- <update>
- Remove WebDAV lock null support in accordance with RFC 4918 section 7.3
- and annex D. Instead a lock on a non existing resource will create an
- empty file locked with a regular lock. (remm)
- </update>
- <update>
- Rewrite implementation of WebDAV shared locks to comply with RFC 4918.
- (remm)
- </update>
- <update>
- Implement WebDAV <code>If</code> header using code from the Apache
- Jackrabbit project. (remm)
- </update>
- <!-- Entries for backport and removal before 12.0.0-M1 below this line
-->
->>>>>>> ac76965a76 (Rewrite implementation of WebDAV shared locks)
<update>
<bug>69374</bug>: Properly separate between table header and body
in <code>DefaultServlet</code>'s listing. (michaelo)
@@ -190,10 +169,19 @@
and annex D. Instead a lock on a non existing resource will create an
empty file locked with a regular lock. (remm)
</update>
+ <update>
+ Rewrite implementation of WebDAV shared locks to comply with RFC 4918.
+ (remm)
+ </update>
+ <update>
+ Implement WebDAV <code>If</code> header using code from the Apache
+ Jackrabbit project. (remm)
+ </update>
<update>
Add base WebDAV <code>PROPPATCH</code> implementation, to be extended
- by overriding the <code>proppatchResource</code> and
- <code>propfindResource</code> methods of the WebDAV Servlet to
+ by overriding the <code>proppatchResource</code>,
+ <code>propfindResource</code>, <code>copyResource</code> and
+ <code>deleteResource</code> methods of the WebDAV Servlet to
provide the desired level of support for dead properties. (remm)
</update>
</changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
