[tomcat] branch main updated: Fix BZ 66602 - skip sending the WINDOW_UPDATE frame if the increment is zero.

[lihan]

This is an automated email from the ASF dual-hosted git repository.

lihan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 5af5af674f Fix BZ 66602 - skip sending the WINDOW_UPDATE frame if the 
increment is zero.
5af5af674f is described below

commit 5af5af674f74bc88febc5cd5dc06213de516eb3e
Author: lihan <li...@apache.org>
AuthorDate: Fri May 19 14:06:09 2023 +0800

    Fix BZ 66602 - skip sending the WINDOW_UPDATE frame if the increment is 
zero.
    
    Closes #619
    https://bz.apache.org/bugzilla/show_bug.cgi?id=66602
---
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 +++-
 webapps/docs/changelog.xml                            | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 46f3eee022..d890945452 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1522,7 +1522,9 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
             // the call to this method. This means the bytes read will have 
been
             // written to the original stream and, effectively, swallowed.
             // Therefore, need to notify that those bytes were swallowed here.
-            onSwallowedDataFramePayload(streamId, dataLength);
+            if (dataLength > 0) {
+                onSwallowedDataFramePayload(streamId, dataLength);
+            }
         }
     }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d5a96ce78c..e37c67094b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -137,6 +137,15 @@
       </add>
     </changelog>
   </subsection>
+  <subsection name="Coyote">
+    <changelog>
+      <fix>
+        <bug>66602</bug>: not sending WINDOW_UPDATE when dataLength is ZERO
+        on call SwallowedDataFramePayload. Pull request #619 by
+        ledefe. (lihan)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Other">
     <changelog>
       <update>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org