This is an automated email from the ASF dual-hosted git repository.
markt 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 ed9a4ce Re-order for more predictable behaviour
ed9a4ce is described below
commit ed9a4ce2a27df336f1d4bc4d7230b9172ba2a8a5
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 25d9111..efb2cca 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -653,8 +653,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
