Author: markt
Date: Fri Oct 14 10:41:01 2016
New Revision: 1764862
URL: http://svn.apache.org/viewvc?rev=1764862&view=rev
Log:
Don't process the stream if it has been reset during header parsing
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=1764862&r1=1764861&r2=1764862&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Fri Oct
14 10:41:01 2016
@@ -1246,7 +1246,7 @@ class Http2UpgradeHandler extends Abstra
public void headersEnd(int streamId) throws ConnectionException {
setMaxProcessedStream(streamId);
Stream stream = getStream(streamId,
connectionState.get().isNewStreamAllowed());
- if (stream != null) {
+ if (stream != null && stream.isActive()) {
processStreamOnContainerThread(stream);
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1764862&r1=1764861&r2=1764862&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Oct 14 10:41:01 2016
@@ -85,6 +85,10 @@
Review HTTP/2 implementation removing unused code, reducing visibility
where possible and using final where appropriate. (markt)
</scode>
+ <fix>
+ Don't continue to process an HTTP/2 stream if it is reset during header
+ parsing. (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
