[tomcat] 01/08: Rename Output.swallowedPadding to onSwallowedDataFramePayload

[markt]

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

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

commit 26a5bfc64c9e67f71180104a41e922a82cb187ad
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Mar 12 09:55:38 2021 +0000

    Rename Output.swallowedPadding to onSwallowedDataFramePayload
    
    This change is in preparation for fixes to BZ 65179
---
 java/org/apache/coyote/http2/Http2Parser.java         | 17 +++++++++++++++--
 java/org/apache/coyote/http2/Http2UpgradeHandler.java |  4 ++--
 test/org/apache/coyote/http2/Http2TestBase.java       |  6 +++---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2Parser.java 
b/java/org/apache/coyote/http2/Http2Parser.java
index a20ee33..6552d23 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -196,7 +196,7 @@ class Http2Parser {
             }
         }
         if (Flags.hasPadding(flags)) {
-            output.swallowedPadding(streamId, padLength);
+            output.onSwallowedDataFramePayload(streamId, padLength);
         }
     }
 
@@ -641,7 +641,20 @@ class Http2Parser {
         ByteBuffer startRequestBodyFrame(int streamId, int payloadSize, 
boolean endOfStream) throws Http2Exception;
         void endRequestBodyFrame(int streamId) throws Http2Exception;
         void receivedEndOfStream(int streamId) throws ConnectionException;
-        void swallowedPadding(int streamId, int paddingLength) throws 
ConnectionException, IOException;
+        /**
+         * Notification triggered when the parser swallows some or all of a 
DATA
+         * frame payload without writing it to the ByteBuffer returned by
+         * {@link #startRequestBodyFrame(int, int, boolean)}.
+         *
+         * @param streamId  The stream on which the payload that has been
+         *                  swallowed was received
+         * @param swallowedDataBytesCount   The number of bytes that the parser
+         *                                  swallowed.
+         *
+         * @throws ConnectionException
+         * @throws IOException
+         */
+        void onSwallowedDataFramePayload(int streamId, int 
swallowedDataBytesCount) throws ConnectionException, IOException;
 
         // Header frames
         HeaderEmitter headersStart(int streamId, boolean headersEndStream)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 149ec79..02e6b9d 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1610,11 +1610,11 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 
 
     @Override
-    public void swallowedPadding(int streamId, int paddingLength) throws
+    public void onSwallowedDataFramePayload(int streamId, int 
swallowedDataBytesCount) throws
             ConnectionException, IOException {
         AbstractNonZeroStream abstractNonZeroStream = 
getAbstractNonZeroStream(streamId, true);
         // +1 is for the payload byte used to define the padding length
-        writeWindowUpdate(abstractNonZeroStream, paddingLength + 1, false);
+        writeWindowUpdate(abstractNonZeroStream, swallowedDataBytesCount + 1, 
false);
     }
 
 
diff --git a/test/org/apache/coyote/http2/Http2TestBase.java 
b/test/org/apache/coyote/http2/Http2TestBase.java
index 332a2f7..bb3f145 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -1197,10 +1197,10 @@ public abstract class Http2TestBase extends 
TomcatBaseTest {
 
 
         @Override
-        public void swallowedPadding(int streamId, int paddingLength) {
+        public void onSwallowedDataFramePayload(int streamId, int 
swallowedDataBytesCount) {
             trace.append(streamId);
-            trace.append("-SwallowedPadding-[");
-            trace.append(paddingLength);
+            trace.append("-SwallowedDataFramePayload-[");
+            trace.append(swallowedDataBytesCount);
             trace.append("]\n");
         }
 


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