Don't set CURLOPT_CONNECTTIMEOUT if connectTimeout is 0. CONNECT_TIMEOUT constant set to 0.

Author: rmruano

changes.txt

@@ -1,8 +1,7 @@
 CHANGES
 
 2015-05-14
-- CURLOPT_CONNECTTIMEOUT added to the HTTP transport curl options
-- Support for a custom connection timeout through a connectTimeout parameter
+- Support for a custom connection timeout through a connectTimeout parameter. CURLOPT_CONNECTTIMEOUT added to the HTTP transport curl options if a connectTimeout is >0 #841
 
 2015-05-11
 - Release 2.0.0

lib/Elastica/Connection.php

@@ -38,10 +38,10 @@ class Connection extends Param
     const TIMEOUT = 300;
 
     /**
-     * Number of seconds after a connection timeout occurs for every request
-     * Use a small value if you need a fast response in case of dead servers.
+     * Number of seconds after a connection timeout occurs for every request during the connection phase.
+     * @see Connection::setConnectTimeout();
      */
-    const CONNECT_TIMEOUT = 5;
+    const CONNECT_TIMEOUT = 0;
 
     /**
      * Creates a new connection object. A connection is enabled by default
@@ -166,6 +166,12 @@ public function getTimeout()
     }
 
     /**
+     * Number of seconds after a connection timeout occurs for every request during the connection phase.
+     * Use a small value if you need a fast fail in case of dead, unresponsive or unreachable servers (~5 sec).
+     *
+     * Set to zero to switch to the default built-in connection timeout (300 seconds in curl).
+     * @see http://curl.haxx.se/libcurl/c/CURLOPT_CONNECTTIMEOUT.html
+     *
      * @param  int   $timeout Connect timeout in seconds
      * @return $this
      */
@@ -179,7 +185,7 @@ public function setConnectTimeout($timeout)
      */
     public function getConnectTimeout()
     {
-        return (int) $this->hasParam('connectTimeout') ? $this->getParam('connectTimeout') : self::CONNECT_TIMEOUT;
+       return (int) $this->hasParam('connectTimeout') ? $this->getParam('connectTimeout') : self::CONNECT_TIMEOUT;
     }
 
     /**

lib/Elastica/Transport/Http.php

@@ -70,9 +70,14 @@ public function exec(Request $request, array $params)
 
         curl_setopt($conn, CURLOPT_URL, $baseUri);
         curl_setopt($conn, CURLOPT_TIMEOUT, $connection->getTimeout());
-        curl_setopt($conn, CURLOPT_CONNECTTIMEOUT, $connection->getConnectTimeout());
         curl_setopt($conn, CURLOPT_FORBID_REUSE, 0);
 
+        /* @see Connection::setConnectTimeout() */
+        $connectTimeout = $connection->getConnectTimeout();
+        if ($connectTimeout>0) {
+            curl_setopt($conn, CURLOPT_CONNECTTIMEOUT, $connection->getConnectTimeout());
+        }
+
         $proxy = $connection->getProxy();
 
         // See: https://github.com/facebook/hhvm/issues/4875