You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2018/03/15 11:10:37 UTC
svn commit: r1826794 - in /tomcat/trunk:
java/org/apache/coyote/http2/Http2UpgradeHandler.java
webapps/docs/changelog.xml
Author: markt
Date: Thu Mar 15 11:10:37 2018
New Revision: 1826794
URL: http://svn.apache.org/viewvc?rev=1826794&view=rev
Log:
Improve debug logging for HTTP/2 pushed streams.
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1826794&r1=1826793&r2=1826794&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Thu Mar 15 11:10:37 2018
@@ -542,13 +542,18 @@ class Http2UpgradeHandler extends Abstra
* Separate method to allow Http2AsyncUpgradeHandler to call this code
* without synchronizing on socketWrapper since it doesn't need to.
*/
- protected HeaderFrameBuffers doWriteHeaders(Stream stream, int pushedStreamId, MimeHeaders mimeHeaders,
- boolean endOfStream, int payloadSize) throws IOException {
+ protected HeaderFrameBuffers doWriteHeaders(Stream stream, int pushedStreamId,
+ MimeHeaders mimeHeaders, boolean endOfStream, int payloadSize) throws IOException {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.writeHeaders", connectionId,
- stream.getIdentifier(), Integer.valueOf(pushedStreamId),
- Boolean.valueOf(endOfStream)));
+ if (pushedStreamId == 0) {
+ log.debug(sm.getString("upgradeHandler.writeHeaders", connectionId,
+ stream.getIdentifier()));
+ } else {
+ log.debug(sm.getString("upgradeHandler.writePushHeaders", connectionId,
+ stream.getIdentifier(), Integer.valueOf(pushedStreamId),
+ Boolean.valueOf(endOfStream)));
+ }
}
if (!stream.canWrite()) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1826794&r1=1826793&r2=1826794&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar 15 11:10:37 2018
@@ -79,6 +79,9 @@
Refactor the check for a paused connector to consistently prevent new
streams from being created after the connector has been paused. (markt)
</fix>
+ <fix>
+ Improve debug logging for HTTP/2 pushed streams. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="jdbc-pool">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org