Author: violetagg
Date: Tue Jul 2 07:30:18 2013
New Revision: 1498811
URL: http://svn.apache.org/r1498811
Log:
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.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1498808
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1498811&r1=1498810&r2=1498811&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Tue Jul 2 07:30:18 2013
@@ -1082,7 +1082,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);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1498811&r1=1498810&r2=1498811&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jul 2 07:30:18 2013
@@ -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">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
