Author: markt
Date: Thu Jun 30 11:50:07 2016
New Revision: 1750776
URL: http://svn.apache.org/viewvc?rev=1750776&view=rev
Log:
Align HTTP/2 with AJP and HTTP/1.1 and commit the response before any body data
is written to OutputBuffer
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1750776&r1=1750775&r2=1750776&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Thu Jun 30 11:50:07
2016
@@ -467,6 +467,9 @@ public class Stream extends AbstractStre
throw new IllegalStateException(
sm.getString("stream.closed", getConnectionId(),
getIdentifier()));
}
+ if (!coyoteResponse.isCommitted()) {
+ coyoteResponse.sendHeaders();
+ }
int len = chunk.getLength();
int offset = 0;
while (len > 0) {
@@ -497,9 +500,6 @@ public class Stream extends AbstractStre
getIdentifier(), Integer.toString(buffer.position()),
Boolean.toString(writeInProgress),
Boolean.toString(closed)));
}
- if (!coyoteResponse.isCommitted()) {
- coyoteResponse.sendHeaders();
- }
if (buffer.position() == 0) {
if (closed && !endOfStreamSent) {
// Handling this special case here is simpler than trying
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
