BZ 66281 - unexpected timeouts when using HTTP/2 and NIO2

Timeouts may appear as client disconnections
https://bz.apache.org/bugzilla/show_bug.cgi?id=66281

Author: markt-asf

java/org/apache/coyote/http2/Http2UpgradeHandler.java

@@ -274,6 +274,10 @@ public void init(WebConnection webConnection) {
             throw new ProtocolException(sm.getString("upgradeHandler.pingFailed"), ioe);
         }
 
+        // Allow streams and connection to determine timeouts
+        socketWrapper.setReadTimeout(-1);
+        socketWrapper.setWriteTimeout(-1);
+
         if (webConnection != null) {
             processStreamOnContainerThread(stream);
         }
@@ -337,10 +341,7 @@ public SocketState upgradeDispatch(SocketEvent status) {
                     }
                 }
                 try {
-                    // There is data to read so use the read timeout while
-                    // reading frames ...
-                    socketWrapper.setReadTimeout(getReadTimeout());
-                    // ... and disable the connection timeout
+                    // Disable the connection timeout while frames are processed
                     setConnectionTimeout(-1);
                     while (true) {
                         try {
@@ -1603,6 +1604,15 @@ public boolean fill(boolean block, byte[] data, int offset, int length) throws I
         int thisRead = 0;
 
         while (len > 0) {
+            // Blocking reads use the protocol level read timeout. Non-blocking
+            // reads do not timeout. The intention is that once a frame has
+            // started to be read, the read timeout applies until it is
+            // completely read.
+            if (nextReadBlock) {
+                socketWrapper.setReadTimeout(protocol.getReadTimeout());
+            } else {
+                socketWrapper.setReadTimeout(-1);
+            }
             thisRead = socketWrapper.read(nextReadBlock, data, pos, len);
             if (thisRead == 0) {
                 if (nextReadBlock) {

webapps/docs/changelog.xml

@@ -186,6 +186,10 @@
         <bug>66276</bug>: Fix incorrect class cast when adding
         a descendant of HTTP/2 streams. (lihan)
       </fix>
+      <fix>
+        <bug>66281</bug>: Fix unexpected timeouts that may appear as client
+        disconnections when using HTTP/2 and NIO2. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">