Java uses 0 rather than -1 for infinite socket timeout

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@763585 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/net/JIoEndpoint.java b/java/org/apache/tomcat/util/net/JIoEndpoint.java
index 400d1b6..0f37289 100644 (file)
--- a/java/org/apache/tomcat/util/net/JIoEndpoint.java
+++ b/java/org/apache/tomcat/util/net/JIoEndpoint.java
@@ -253,7 +253,14 @@ public class JIoEndpoint {
      * Socket timeout.
      */
     public int getSoTimeout() { return socketProperties.getSoTimeout(); }
-    public void setSoTimeout(int soTimeout) { socketProperties.setSoTimeout(soTimeout); }
+    public void setSoTimeout(int soTimeout) {
+        // APR/native uses -1 for infinite - Java uses 0
+        if (soTimeout == -1) {
+            socketProperties.setSoTimeout(0);
+        } else {
+            socketProperties.setSoTimeout(soTimeout);
+        }
+    }
 
 
     /**