This is an automated email from the ASF dual-hosted git repository.
markt 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 bd8141afc1 Add change log entry for BZ 69982. Minor clean-up.
bd8141afc1 is described below
commit bd8141afc14c92905bf9aeab9988869c3e995346
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Mar 23 12:10:37 2026 +0000
Add change log entry for BZ 69982. Minor clean-up.
---
java/org/apache/tomcat/util/net/NioEndpoint.java | 7 +++++--
webapps/docs/changelog.xml | 6 ++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 6382c164d0..8a75d18aea 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1374,26 +1374,29 @@ public class NioEndpoint extends
AbstractJsseEndpoint<NioChannel,SocketChannel>
return !socketBufferHandler.isWriteBufferEmpty() ||
getSocket().getOutboundRemaining() > 0;
}
+
/*
* https://bz.apache.org/bugzilla/show_bug.cgi?id=69982
*
- * Similar to socketOrNetworkBufferHasDataLeft(), check the additional
buffer for TLS
+ * Similar to socketOrNetworkBufferHasDataLeft(), check the additional
buffer for TLS.
*/
@Override
public boolean hasDataToWrite() {
return super.hasDataToWrite() ||
getSocket().getOutboundRemaining() > 0;
}
+
/*
* https://bz.apache.org/bugzilla/show_bug.cgi?id=69982
*
- * Similar to socketOrNetworkBufferHasDataLeft(), check the additional
buffer for TLS
+ * Similar to socketOrNetworkBufferHasDataLeft(), check the additional
buffer for TLS.
*/
@Override
public boolean canWrite() {
return super.canWrite() && getSocket().getOutboundRemaining() == 0;
}
+
@Override
protected void doWrite(boolean block, ByteBuffer buffer) throws
IOException {
int n;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c3db490dc2..df5abdbc38 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -116,6 +116,12 @@
being closed without a <code>GOAWAY</code> frame if an invalid
<code>HEADERS</code> frame was received. (markt)
</fix>
+ <fix>
+ <bug>69982</bug>: Fix a bug in the non-blocking flushing code for
+ NIO+TLS that meant that a response may not be fully written until the
+ connection is closed. Pull request <pr>966</pr> provided by Phil Clay.
+ (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
