Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46666

keepAliveTimeout should always be used regardless of setting of disableUploadTimeout

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@744160 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index 5abe42e..6e04cc7 100644 (file)
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -781,7 +781,7 @@ public class Http11Processor implements ActionHook {
 
             // Parsing the request header
             try {
-                if (!disableUploadTimeout && keptAlive) {
+                if (keptAlive) {
                     if (keepAliveTimeout > 0) {
                         socket.setSoTimeout(keepAliveTimeout);
                     }