Check stream state after wait

Verify HTTP/2 stream is still writable before assuming a timeout occurred. The reason for bad behavior is a bit unclear (I see it with logging on and async IO), but the check is inconsistent.
apache · Mar 8, 2019 · a1cb1ac · a1cb1ac
1 parent 6367351
commit a1cb1ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/java/org/apache/coyote/http2/Stream.java b/java/org/apache/coyote/http2/Stream.java
@@ -1052,7 +1052,7 @@ public final int doRead(ApplicationBufferHandler applicationBufferHandler)
                             throw new IOException(sm.getString("stream.inputBuffer.reset"));
                         }
 
-                        if (inBuffer.position() == 0) {
+                        if (inBuffer.position() == 0 && isActive() && !isInputFinished()) {
                             String msg = sm.getString("stream.inputBuffer.readTimeout");
                             StreamException se = new StreamException(
                                     msg, Http2Error.ENHANCE_YOUR_CALM, getIdAsInt());

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -138,6 +138,10 @@
         Ensure enough buffer space when using TLS with NIO2 by using the main
         read buffer to store additional decrypted data. (remm)
       </fix>
+      <fix>
+        Verify HTTP/2 stream is still writable before assuming a timeout
+        occurred. (remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="WebSocket">