Align HTTP/2 with AJP and HTTP/1.1 and commit the response before any…

… body data is written to OutputBuffer git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1750776 13f79535-47bb-0310-9956-ffa450edef68
guoshun0321 · Jun 30, 2016 · 8dfd057 · 8dfd057
1 parent df3d6f3
commit 8dfd057
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/java/org/apache/coyote/http2/Stream.java b/java/org/apache/coyote/http2/Stream.java
@@ -467,6 +467,9 @@ public synchronized int doWrite(ByteChunk chunk) throws IOException {
                 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 @@ private synchronized boolean flush(boolean writeInProgress, boolean block)
                         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