Fix BZ 66842 - include DATA frames in overhead count with async

https://bz.apache.org/bugzilla/show_bug.cgi?id=66842
apache · Aug 6, 2023 · c551eca · c551eca
1 parent aa77cb2
commit c551eca
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -227,6 +227,9 @@ void writeBody(Stream stream, ByteBuffer data, int len, boolean finished) throws
             log.debug(sm.getString("upgradeHandler.writeBody", connectionId, stream.getIdAsString(),
                     Integer.toString(len), Boolean.valueOf(finished)));
         }
+
+        reduceOverheadCount(FrameType.DATA);
+
         // Need to check this now since sending end of stream will change this.
         boolean writable = stream.canWrite();
         byte[] header = new byte[9];

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1375,7 +1375,7 @@ protected final String getConnectionId() {
     }
 
 
-    private void reduceOverheadCount(FrameType frameType) {
+    void reduceOverheadCount(FrameType frameType) {
         // A non-overhead frame reduces the overhead count by
         // Http2Protocol.DEFAULT_OVERHEAD_REDUCTION_FACTOR. A simple browser
         // request is likely to have one non-overhead frame (HEADERS) and one

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -165,6 +165,11 @@
         called after an error during asynchronous processing with HTTP/2.
         (markt)
       </fix>
+      <fix>
+        <bug>66842</bug>: When using asynchronous I/O (the default for NIO and
+        NIO2), include DATA frames when calculating the HTTP/2 overhead count to
+        ensure that connections are not prematurely terminated. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="WebSocket">