You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2013/07/02 09:15:30 UTC
svn commit: r1498808 -
/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Author: violetagg
Date: Tue Jul 2 07:15:30 2013
New Revision: 1498808
URL: http://svn.apache.org/r1498808
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55180
Correctly handle infinite soTimeout when disableUploadTimeout is set to false.
Patch provided by Roger Wang.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1498808&r1=1498807&r2=1498808&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Tue Jul 2 07:15:30 2013
@@ -1068,7 +1068,11 @@ public abstract class AbstractHttp11Proc
}
if (!disableUploadTimeout) {
- setSocketTimeout(endpoint.getSoTimeout());
+ if(endpoint.getSoTimeout() > 0) {
+ setSocketTimeout(endpoint.getSoTimeout());
+ } else {
+ setSocketTimeout(0);
+ }
}
rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org