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 ce2838cdc2 Move entries to correct versions (various merge errors)
ce2838cdc2 is described below
commit ce2838cdc2b26fd9ff9258e1c98e5e615e1197be
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Oct 1 13:28:28 2026 +0100
Move entries to correct versions (various merge errors)
---
webapps/docs/changelog.xml | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6cf042364c..ee64bcd30e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -154,6 +154,11 @@
<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)
@@ -162,6 +167,11 @@
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.
@@ -2185,6 +2195,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
@@ -4466,16 +4480,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>
- 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">
@@ -4491,10 +4495,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]
