tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1826111 - in /tomcat/trunk: conf/logging.properties java/org/apache/coyote/http2/Http2UpgradeHandler.java webapps/docs/changelog.xml
Date Wed, 07 Mar 2018 14:37:52 GMT
Author: markt
Date: Wed Mar  7 14:37:52 2018
New Revision: 1826111

URL: http://svn.apache.org/viewvc?rev=1826111&view=rev
Log:
Address intermittent test failure (hopefully) in TestHttp2Section_6_8.

Modified:
    tomcat/trunk/conf/logging.properties
    tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/conf/logging.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/logging.properties?rev=1826111&r1=1826110&r2=1826111&view=diff
==============================================================================
--- tomcat/trunk/conf/logging.properties (original)
+++ tomcat/trunk/conf/logging.properties Wed Mar  7 14:37:52 2018
@@ -68,7 +68,7 @@ org.apache.catalina.core.ContainerBase.[
 #org.apache.jasper.compiler.TldLocationsCache.level = FINE
 
 # To see debug messages for HTTP/2 handling, uncomment the following line:
-#org.apache.coyote.http2.level = FINE
+org.apache.coyote.http2.level = FINE
 
 # To see debug messages for WebSocket handling, uncomment the following line:
 #org.apache.tomcat.websocket.level = FINE

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=1826111&r1=1826110&r2=1826111&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Wed Mar  7 14:37:52
2018
@@ -1299,11 +1299,13 @@ class Http2UpgradeHandler extends Abstra
 
     @Override
     public void headersEnd(int streamId) throws ConnectionException {
-        setMaxProcessedStream(streamId);
         Stream stream = getStream(streamId, connectionState.get().isNewStreamAllowed());
-        if (stream != null && stream.isActive()) {
-            if (stream.receivedEndOfHeaders()) {
-                processStreamOnContainerThread(stream);
+        if (stream != null) {
+            setMaxProcessedStream(streamId);
+            if (stream.isActive()) {
+                if (stream.receivedEndOfHeaders()) {
+                    processStreamOnContainerThread(stream);
+                }
             }
         }
     }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1826111&r1=1826110&r2=1826111&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Mar  7 14:37:52 2018
@@ -59,6 +59,10 @@
       <fix>
         Avoid potential loop in APR/Native poller. (markt)
       </fix>
+      <fix>
+        Ensure streams that are received but not processed are excluded from the
+        tracking of maximum ID of processed streams. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">



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


Mime
View raw message