This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 1ea50d6d35 Move entries to correct versions (various merge errors)
1ea50d6d35 is described below
commit 1ea50d6d352a3e75f51cc09369f5ef4a68f439c1
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Oct 1 13:21:12 2026 +0100
Move entries to correct versions (various merge errors)
---
webapps/docs/changelog.xml | 48 +++++++++++++++++++++++-----------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 096cc0c4e0..4d59163791 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -154,10 +154,30 @@
<pr>1073</pr>: Fix possible corruption when using HTTP/2 and async IO
on uploads. Submitted by Tim Burke. (remm)
</fix>
+ <fix>
+ Avoid very rare race between async write notification and completion.
+ Skip the write notification in these cases since it would be useless.
+ (remm)
+ </fix>
<fix>
Fix a timing issue that could cause large non-blocking writes to stall
for AJP connections. (markt)
</fix>
+ <fix>
+ Improve the handling of the requirements for response closure in
section
+ 5.7 of the Servlet specification. If a non-blocking write writes
exactly
+ content-length bytes to the response, allow that write to complete in a
+ non-blocking manner before the response is closed. (markt)
+ </fix>
+ <fix>
+ Ensure that the non-blocking write buffer is empty before sending an
AJP
+ end response message. (markt)
+ </fix>
+ <fix>
+ Fix <code>CharChunk.indexOf(char)</code> so that it searches from the
+ start of the chunk rather than from twice the chunk's start offset
+ when the chunk does not begin at the start of its buffer. (breken-ai)
+ </fix>
<fix>
<bug>70247</bug>: Fix a leak in the HTTP/2 connection flow control
window when part of the HTTP request body is received but not read.
@@ -2209,6 +2229,10 @@
</subsection>
<subsection name="WebSocket">
<changelog>
+ <fix>
+ <bug>69844</bug>: Close the connection with a protocol error if the
+ server sends masked frames. (markt)
+ </fix>
<fix>
<bug>69845</bug>: When using <code>permessage-deflate</code> with Java
25 onwards, handle the underlying <code>Inflater</code> and/or
@@ -4551,26 +4575,6 @@
meant that the first header in the response was also dropped. Fix based
on pull request <pr>710</pr> by foremans. (markt)
</fix>
- <fix>
- Improve the handling of the requirements for response closure in
section
- 5.7 of the Servlet specification. If a non-blocking write writes
exactly
- content-length bytes to the response, allow that write to complete in a
- non-blocking manner before the response is closed. (markt)
- </fix>
- <fix>
- Ensure that the non-blocking write buffer is empty before sending an
AJP
- end response message. (markt)
- </fix>
- <fix>
- Avoid very rare race between async write notification and completion.
- Skip the write notification in these cases since it would be useless.
- (remm)
- </fix>
- <fix>
- Fix <code>CharChunk.indexOf(char)</code> so that it searches from the
- start of the chunk rather than from twice the chunk's start offset
- when the chunk does not begin at the start of its buffer. (breken-ai)
- </fix>
</changelog>
</subsection>
<subsection name="Jasper">
@@ -4586,10 +4590,6 @@
</subsection>
<subsection name="WebSocket">
<changelog>
- <fix>
- <bug>69844</bug>: Close the connection with a protocol error if the
- server sends masked frames. (markt)
- </fix>
<fix>
<bug>68884</bug>: Reduce the write timeout when writing WebSocket close
messages for abnormal closes. The timeout defaults to 50 milliseconds
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
