This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 24c8ef1 Re-order for more predictable behaviour
24c8ef1 is described below
commit 24c8ef178e9cfb3630f533a79418c181c80b340b
Author: Mark Thomas <[email protected]>
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 dc6ef2d..21deee1 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: [email protected]
For additional commands, e-mail: [email protected]
