Author: markt Date: Tue Aug 9 16:29:01 2016 New Revision: 1755629 URL: http://svn.apache.org/viewvc?rev=1755629&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59950 Correct log message when reporting that the current number of HTTP/2 streams for a connection could not be pruned to below the limit.
Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1755629&r1=1755628&r2=1755629&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Tue Aug 9 16:29:01 2016 @@ -104,7 +104,7 @@ upgradeHandler.noNewStreams=Connection [ upgradeHandler.pause.entry=Connection [{0}] Pausing upgradeHandler.prefaceReceived=Connection [{0}], Connection preface received from client upgradeHandler.pingFailed=Connection [{0}] Failed to send ping to client -upgradeHandler.pruneIncomplete=Connection [{0}] Failed to fully prune the connection because streams were active / used in the priority tree. There are [{0}] too many streams +upgradeHandler.pruneIncomplete=Connection [{0}] Failed to fully prune the connection because streams were active / used in the priority tree. There are [{1}] too many streams upgradeHandler.pruneStart=Connection [{0}] Starting pruning of old streams. Limit is [{1}] + 10% and there are currently [{2}] streams. 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 Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1755629&r1=1755628&r2=1755629&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Aug 9 16:29:01 2016 @@ -126,6 +126,11 @@ When using a keystore, OpenSSL will still need default to though. (remm) </fix> + <fix> + <bug>59950</bug>: Correct log message when reporting that the current + number of HTTP/2 streams for a connection could not be pruned to below + the limit. (markt) + </fix> </changelog> </subsection> <subsection name="Jasper"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org