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 67cd6b6879 Fix BZ 69982 Flush final block of TLS response payload
67cd6b6879 is described below
commit 67cd6b68791f74a39cd0196c6ed23aad302c3fc7
Author: Phil Clay <[email protected]>
AuthorDate: Fri Mar 20 09:23:16 2026 -0600
Fix BZ 69982 Flush final block of TLS response payload
https://bz.apache.org/bugzilla/show_bug.cgi?id=69982
---
java/org/apache/tomcat/util/net/NioEndpoint.java | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index effbb7ad78..6382c164d0 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1374,6 +1374,25 @@ 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
+ */
+ @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
+ */
+ @Override
+ public boolean canWrite() {
+ return super.canWrite() && getSocket().getOutboundRemaining() == 0;
+ }
@Override
protected void doWrite(boolean block, ByteBuffer buffer) throws
IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
