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

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


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

commit 338aaec1f37984e8d8bef11a79ca929128e509ec
Author: ledefe <led...@qq.com>
AuthorDate: Fri May 19 13:24:50 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                            | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index c5aeaf87ea..b32b9dbbfb 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1625,7 +1625,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 a04e745926..6a2afaa8b7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,11 @@
         defined in RFC 9218 rather than the one defined in RFC 7540.
         (markt)
       </update>
+      <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">


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

Reply via email to