Author: markt
Date: Mon Jul 1 20:28:01 2013
New Revision: 1498669
URL: http://svn.apache.org/r1498669
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/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=1498669&r1=1498668&r2=1498669&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Jul 1
20:28:01 2013
@@ -163,7 +163,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);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
