Mark,

On 5/24/22 12:46, [email protected] wrote:
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
      new 680db4448d Additional fixes for 66076
680db4448d is described below

commit 680db4448d392752fb57b91639e7ab34a3f58105
Author: Mark Thomas <[email protected]>
AuthorDate: Tue May 24 17:46:20 2022 +0100

     Additional fixes for 66076
The vectored IO version of the fix.
---
  java/org/apache/tomcat/util/net/AprEndpoint.java      |  7 +++++++
  java/org/apache/tomcat/util/net/Nio2Endpoint.java     |  7 +++++++
  java/org/apache/tomcat/util/net/NioEndpoint.java      | 19 ++++++++++++-------
  .../org/apache/tomcat/util/net/SocketWrapperBase.java |  4 +++-
  4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index c02e90fc09..20d10efa11 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2813,6 +2813,13 @@ public class AprEndpoint extends 
AbstractEndpoint<Long,Long> implements SNICallB
                  return inline;
              }
+ @Override
+            protected boolean hasOutboundRemaining() {
+                // NIO2 never has remaining outbound data when the completion
+                // handler is called
+                return false;
+            }

s/NIO2/APR/?

Should this just be the default implementation instead of an abstract superclass method and two separate -nothing implementations?

-chris

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to