Author: markt
Date: Fri Feb 13 16:17:54 2009
New Revision: 744160
URL: http://svn.apache.org/viewvc?rev=744160&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46666
keepAliveTimeout should always be used regardless of setting of
disableUploadTimeout
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=744160&r1=744159&r2=744160&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Fri Feb 13
16:17:54 2009
@@ -781,7 +781,7 @@
// Parsing the request header
try {
- if (!disableUploadTimeout && keptAlive) {
+ if (keptAlive) {
if (keepAliveTimeout > 0) {
socket.setSoTimeout(keepAliveTimeout);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]