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 972d697 Don't override timeouts in swallow upload handling
972d697 is described below
commit 972d6973e0828828d752280cf6f34ccbbfefb71b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Apr 7 22:32:15 2019 +0100
Don't override timeouts in swallow upload handling
---
java/org/apache/coyote/http2/StreamProcessor.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http2/StreamProcessor.java
b/java/org/apache/coyote/http2/StreamProcessor.java
index 90bf224..5d1e60d 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -416,11 +416,12 @@ class StreamProcessor extends AbstractProcessor {
private void endRequest() throws IOException {
- if (!stream.isInputFinished()) {
+ if (!stream.isInputFinished() && getErrorState().isIoAllowed()) {
// The request has been processed but the request body has not been
// fully read. This typically occurs when Tomcat rejects an upload
// of some form (e.g. PUT or POST). Need to tell the client not to
- // send any more data.
+ // send any more data but only if a reset has not already been
+ // triggered.
StreamException se = new StreamException(
sm.getString("streamProcessor.cancel",
stream.getConnectionId(),
stream.getIdentifier()), Http2Error.CANCEL,
stream.getIdAsInt());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
