[tomcat] branch master updated (b9b3fa7 -> ffe30d9)

[markt]

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

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


    from b9b3fa7  Fix bz 65137 Don't corrupt response on early termination
     new 23f8eb5  Add missing parameter in log message. Fix comment typo.
     new ffe30d9  Additional fix for BZ 65118

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/coyote/http2/AbstractNonZeroStream.java | 2 +-
 java/org/apache/coyote/http2/Http2UpgradeHandler.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

[markt]

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

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

commit 23f8eb5c42c6e4bd3c877a95083020912ee67eb1
Author: Mark Thomas <[hidden email]>
AuthorDate: Mon Feb 22 16:30:29 2021 +0000

    Add missing parameter in log message. Fix comment typo.
---
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 0903f04..eaf7e88 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -747,7 +747,7 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
     void writeBody(Stream stream, ByteBuffer data, int len, boolean finished) throws IOException {
         if (log.isDebugEnabled()) {
             log.debug(sm.getString("upgradeHandler.writeBody", connectionId, stream.getIdAsString(),
-                    Integer.toString(len)));
+                    Integer.toString(len), Boolean.valueOf(finished)));
         }
 
         reduceOverheadCount();
@@ -1251,7 +1251,7 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH
                     // work through the ordered list of streams.
                     while (toClose > 0 && parent.getIdAsInt() > 0 && parent.getIdAsInt() < stream.getIdAsInt() &&
                             parent.getChildStreams().isEmpty()) {
-                        // This case is safe since we know parent ID > 0 therefore
+                        // This cast is safe since we know parent ID > 0 therefore
                         // this isn't the connection
                         stream = (AbstractNonZeroStream) parent;
                         parent = stream.getParentStream();


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

[markt]

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

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

commit ffe30d91cd90c5c02bc15ec8b15cff43f18557f5
Author: Mark Thomas <[hidden email]>
AuthorDate: Mon Feb 22 16:32:55 2021 +0000

    Additional fix for BZ 65118
   
    When replacing a closed Stream with a RecycledStream instance, the
    priority hierarchy was not maintained. This led to NPEs during the
    pruning process.
---
 java/org/apache/coyote/http2/AbstractNonZeroStream.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/AbstractNonZeroStream.java b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
index bbdfa33..38761ad 100644
--- a/java/org/apache/coyote/http2/AbstractNonZeroStream.java
+++ b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
@@ -122,7 +122,7 @@ abstract class AbstractNonZeroStream extends AbstractStream {
      * level. This is the caller's responsibility.
      */
     void replaceStream(AbstractNonZeroStream replacement) {
-        replacement.setParentStream(getParentStream());
+        getParentStream().addChild(replacement);
         detachFromParent();
         for (AbstractNonZeroStream child : getChildStreams()) {
             replacement.addChild(child);


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]