[tomcat] branch 7.0.x updated: Fix issue spotted by Mark, 0 can be passed along as well for infinite

[re...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
     new f140942  Fix issue spotted by Mark, 0 can be passed along as well for infinite
f140942 is described below

commit f140942d89ee7d9e52c4e273298a1852b8c3f020
Author: remm <re...@apache.org>
AuthorDate: Tue Oct 8 16:09:08 2019 +0200

    Fix issue spotted by Mark, 0 can be passed along as well for infinite
---
 java/org/apache/tomcat/util/net/NioEndpoint.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 33a7d18..eeeb6b8 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -474,7 +474,7 @@ public class NioEndpoint extends AbstractEndpoint<NioChannel> {
         InetSocketAddress addr = (getAddress()!=null?new InetSocketAddress(getAddress(),getPort()):new InetSocketAddress(getPort()));
         serverSock.socket().bind(addr,getBacklog());
         serverSock.configureBlocking(true); //mimic APR behavior
-        if (getSocketProperties().getSoTimeout() > 0) {
+        if (getSocketProperties().getSoTimeout() >= 0) {
             serverSock.socket().setSoTimeout(getSocketProperties().getSoTimeout());
         }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org