This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new d5f26f1 Re-order for more predictable behaviour
d5f26f1 is described below
commit d5f26f1a8124f0b1f0ad545364fbeecdb3c9c9fa
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Mar 24 16:54:33 2021 +0000
Re-order for more predictable behaviour
Once the allocation requests are cancelled, other streams may start to
progress. This can result in errors being reported. Better to report the
error that triggered the closure before this so it is the first error
the client sees. A sequence of errors will then make more sense as it
will be clearer that the first error is the cause of the subsequent
errors.
---
java/org/apache/coyote/http2/Stream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 0fd8cbd..f3bfee8 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -612,8 +612,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
se.getError()));
}
state.sendReset();
- cancelAllocationRequests();
handler.sendStreamReset(se);
+ cancelAllocationRequests();
inputBuffer.swallowUnread();
} catch (IOException ioe) {
ConnectionException ce = new ConnectionException(
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
