Author: markt
Date: Mon Jul 1 20:29:49 2013
New Revision: 1498670
URL: http://svn.apache.org/r1498670
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55177
Correctly handle infinite soTimeout for BIO HTTP connector.
Based on a patch by Nick Bunn.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1498669
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1498670&r1=1498669&r2=1498670&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon
Jul 1 20:29:49 2013
@@ -175,7 +175,11 @@ public class Http11Processor extends Abs
}
// Once the first byte has been read, the standard timeout should
be
// used so restore it here.
- socket.getSocket().setSoTimeout(endpoint.getSoTimeout());
+ if (endpoint.getSoTimeout()> 0) {
+ setSocketTimeout(endpoint.getSoTimeout());
+ } else {
+ setSocketTimeout(0);
+ }
}
}
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=1498670&r1=1498669&r2=1498670&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul 1 20:29:49 2013
@@ -141,6 +141,12 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <bug>55177</bug>: Correctly handle infinite soTimeout for BIO HTTP
+ connector. Based on a patch by Nick Bunn. (markt)
+ </changelog>
+ </subsection>
<subsection name="Cluster">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
