Author: markt
Date: Thu May 4 08:00:01 2017
New Revision: 1793744
URL: http://svn.apache.org/viewvc?rev=1793744&view=rev
Log:
When sending an HTTP/2 push promise with the NIO2 connector, the pushed stream
ID should only be included with the initial push promise frame and not any
subsequent continuation frames.
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java?rev=1793744&r1=1793743&r2=1793744&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java Thu
May 4 08:00:01 2017
@@ -205,7 +205,9 @@ public class Http2AsyncUpgradeHandler ex
while (state != State.COMPLETE) {
byte[] header = new byte[9];
ByteBuffer target = ByteBuffer.allocate(payloadSize);
- target.put(pushedStreamIdBytes);
+ if (first) {
+ target.put(pushedStreamIdBytes);
+ }
state = getHpackEncoder().encode(coyoteRequest.getMimeHeaders(),
target);
target.flip();
if (state == State.COMPLETE || target.limit() > 0) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1793744&r1=1793743&r2=1793744&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May 4 08:00:01 2017
@@ -130,6 +130,11 @@
Do not include a <code>Date</code> header in HTTP/2 reponses with
status
codes less than 200. (markt)
</fix>
+ <fix>
+ When sending an HTTP/2 push promise with the NIO2 connector, the pushed
+ stream ID should only be included with the initial push promise frame
+ and not any subsequent continuation frames. (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
