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 3656681ad5ee2d72a9a935dcffe1238ec4419e75 Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> AuthorDate: Thu Sep 24 13:46:31 2020 +0300 http2: Add 'EndOfStream' to the logs for writeHeaders and writeBody Call streams.size() just once. --- java/org/apache/coyote/http2/Http2UpgradeHandler.java | 7 ++++--- java/org/apache/coyote/http2/LocalStrings.properties | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java b/java/org/apache/coyote/http2/Http2UpgradeHandler.java index 2a2fee5..d5d11e5 100644 --- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java +++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java @@ -662,7 +662,7 @@ public class Http2UpgradeHandler extends AbstractStream implements InternalHttpU if (log.isDebugEnabled()) { if (pushedStreamId == 0) { log.debug(sm.getString("upgradeHandler.writeHeaders", connectionId, - stream.getIdAsString())); + stream.getIdAsString(), Boolean.valueOf(endOfStream))); } else { log.debug(sm.getString("upgradeHandler.writePushHeaders", connectionId, stream.getIdAsString(), Integer.valueOf(pushedStreamId), @@ -1171,9 +1171,10 @@ public class Http2UpgradeHandler extends AbstractStream implements InternalHttpU // maximum number of concurrent streams. long max = localSettings.getMaxConcurrentStreams(); + final int size = streams.size(); if (log.isDebugEnabled()) { log.debug(sm.getString("upgradeHandler.pruneStart", connectionId, - Long.toString(max), Integer.toString(streams.size()))); + Long.toString(max), Integer.toString(size))); } // Only need ~+10% for streams that are in the priority tree, @@ -1187,7 +1188,7 @@ public class Http2UpgradeHandler extends AbstractStream implements InternalHttpU max = Integer.MAX_VALUE; } - int toClose = streams.size() - (int) max; + int toClose = size - (int) max; if (toClose < 1) { return; } diff --git a/java/org/apache/coyote/http2/LocalStrings.properties b/java/org/apache/coyote/http2/LocalStrings.properties index 9c34e93..2b9c586 100644 --- a/java/org/apache/coyote/http2/LocalStrings.properties +++ b/java/org/apache/coyote/http2/LocalStrings.properties @@ -148,8 +148,8 @@ upgradeHandler.upgradeDispatch.entry=Entry, Connection [{0}], SocketStatus [{1}] upgradeHandler.upgradeDispatch.exit=Exit, Connection [{0}], SocketState [{1}] upgradeHandler.windowSizeReservationInterrupted=Connection [{0}], Stream [{1}], reservation for [{2}] bytes upgradeHandler.windowSizeTooBig=Connection [{0}], Stream [{1}], Window size too big -upgradeHandler.writeBody=Connection [{0}], Stream [{1}], Data length [{2}] -upgradeHandler.writeHeaders=Connection [{0}], Stream [{1}] +upgradeHandler.writeBody=Connection [{0}], Stream [{1}], Data length [{2}], EndOfStream [{3}] +upgradeHandler.writeHeaders=Connection [{0}], Stream [{1}], Writing the headers, EndOfStream [{2}] upgradeHandler.writePushHeaders=Connection [{0}], Stream [{1}], Pushed stream [{2}], EndOfStream [{3}] windowAllocationManager.dispatched=Connection [{0}], Stream [{1}], Dispatched --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org