Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55180
Merged revision 1498808 from tomcat/trunk:
Correctly handle infinite soTimeout when disableUploadTimeout is set to false.
Patch provided by Roger Wang.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1498811 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
index 7a668e2..3753836 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11Processor.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
@@ -1082,7 +1082,11 @@
}
if (!disableUploadTimeout) {
- setSocketTimeout(endpoint.getSoTimeout());
+ if(endpoint.getSoTimeout() > 0) {
+ setSocketTimeout(endpoint.getSoTimeout());
+ } else {
+ setSocketTimeout(0);
+ }
}
rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 279cc75..f0f5900 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -147,8 +147,15 @@
</subsection>
<subsection name="Coyote">
<changelog>
- <bug>55177</bug>: Correctly handle infinite soTimeout for BIO HTTP
- connector. Based on a patch by Nick Bunn. (markt)
+ <fix>
+ <bug>55177</bug>: Correctly handle infinite soTimeout for BIO HTTP
+ connector. Based on a patch by Nick Bunn. (markt)
+ </fix>
+ <fix>
+ <bug>55180</bug>: Correctly handle infinite soTimeout when
+ <code>disableUploadTimeout</code> is set to false. Patch provided by
+ Roger Wang. (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
