[tomcat] branch 8.5.x updated (af7b667 -> 0a3fd6b)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[tomcat] branch 8.5.x updated (af7b667 -> 0a3fd6b)

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

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


    from af7b667  Fix bz 65137 Don't corrupt response on early termination
     new 11f1377  Add missing parameter in log message. Fix comment typo.
     new 0a3fd6b  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]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 01/02: Add missing parameter in log message. Fix comment typo.

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 11f137718fe8df61fdadc379d5edd6637de44843
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 9f1cd8a..4ee1104 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -750,7 +750,7 @@ public class Http2UpgradeHandler extends AbstractStream implements InternalHttpU
     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();
@@ -1250,7 +1250,7 @@ public class Http2UpgradeHandler extends AbstractStream implements InternalHttpU
                     // 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]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 02/02: Additional fix for BZ 65118

markt
In reply to this post by 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 0a3fd6b162e550477b2e44a4aabbb99c0e677e08
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 d85840d..930f131 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]