[tomcat] 02/02: Add debug so reason is visible for RST_STREAM frames on invalid streams

[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 27c4109a7a686b71454205faab909e5e1f041b18
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 21 14:57:27 2020 +0100

    Add debug so reason is visible for RST_STREAM frames on invalid streams
---
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 ++++
 java/org/apache/coyote/http2/LocalStrings.properties  | 1 +
 2 files changed, 5 insertions(+)

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index b1c44d9..bc6fed0 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1570,6 +1570,10 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 
     @Override
     public void reset(int streamId, long errorCode) throws Http2Exception  {
+        if (log.isDebugEnabled()) {
+            log.debug(sm.getString("upgradeHandler.reset.receive", 
getConnectionId(), Integer.toString(streamId),
+                    Long.toString(errorCode)));
+        }
         Stream stream = getStream(streamId, true);
         boolean active = stream.isActive();
         stream.checkState(FrameType.RST);
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties 
b/java/org/apache/coyote/http2/LocalStrings.properties
index e80e6d3..f8ceff1 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -133,6 +133,7 @@ upgradeHandler.pruneStart=Connection [{0}] Starting pruning 
of old streams. Limi
 upgradeHandler.pruned=Connection [{0}] Pruned completed stream [{1}]
 upgradeHandler.prunedPriority=Connection [{0}] Pruned unused stream [{1}] that 
may have been part of the priority tree
 upgradeHandler.releaseBacklog=Connection [{0}], Stream [{1}] released from 
backlog
+upgradeHandler.reset.receive=Connection [{0}], Stream [{1}], Reset received 
due to [{2}]
 upgradeHandler.rst.debug=Connection [{0}], Stream [{1}], Error [{2}], Message 
[{3}],  RST (closing stream)
 upgradeHandler.sendPrefaceFail=Connection [{0}], Failed to send preface to 
client
 upgradeHandler.socketCloseFailed=Error closing socket


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