[tomcat] branch 8.5.x updated: Don't override timeouts in swallow upload handling

[ma...@apache.org]

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 2b0983d  Don't override timeouts in swallow upload handling
2b0983d is described below

commit 2b0983d8db7b8c36c138cdec3ceefa14d31faa13
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 c44103e..b3a0277 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -376,11 +376,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org