From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 13 Feb 2009 16:17:54 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46666
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=5dfd203340fe10c221ceaff75165b5572192673c;p=tomcat7.0

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 5abe42eae..6e04cc7e4 100644
--- 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);
                     }