You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2019/04/15 11:35:51 UTC
[tomcat] branch master updated: Revert change as the issue seems
different, despite similarities
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 284a540 Revert change as the issue seems different, despite similarities
284a540 is described below
commit 284a540aa73824529e931751bb4815c89ae1768a
Author: remm <re...@apache.org>
AuthorDate: Mon Apr 15 13:35:39 2019 +0200
Revert change as the issue seems different, despite similarities
---
java/org/apache/coyote/http2/Http2Parser.java | 4 ++--
test/org/apache/coyote/http2/TestStream.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2Parser.java b/java/org/apache/coyote/http2/Http2Parser.java
index 967175f..f5e1986 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -580,13 +580,13 @@ class Http2Parser {
// going to be thrown.
hpackDecoder.getHeaderEmitter().validateHeaders();
+ output.headersEnd(streamId);
+
if (headersEndStream) {
output.receivedEndOfStream(streamId);
headersEndStream = false;
}
- output.headersEnd(streamId);
-
// Reset size for new request if the buffer was previously expanded
if (headerReadBuffer.capacity() > Constants.DEFAULT_HEADER_READ_BUFFER_SIZE) {
headerReadBuffer = ByteBuffer.allocate(Constants.DEFAULT_HEADER_READ_BUFFER_SIZE);
diff --git a/test/org/apache/coyote/http2/TestStream.java b/test/org/apache/coyote/http2/TestStream.java
index 0afaebc..2d03035 100644
--- a/test/org/apache/coyote/http2/TestStream.java
+++ b/test/org/apache/coyote/http2/TestStream.java
@@ -121,8 +121,8 @@ public class TestStream extends Http2TestBase {
"3-HeadersStart\n" +
"3-Header-[x-trailer-2]-[Trailer value two]\n" +
"3-Header-[x-trailer-1]-[Trailer value one]\n" +
- "3-EndOfStream\n" +
- "3-HeadersEnd\n", output.getTrace());
+ "3-HeadersEnd\n" +
+ "3-EndOfStream\n", output.getTrace());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org