Merge pull request jublo#39 from finwe/timeouts

mynetx · mynetx · commit 85885c7465b0 · 2013-08-14T11:57:40.000+02:00
Availability to set cURL timeouts
diff --git a/src/codebird.php b/src/codebird.php
@@ -109,6 +109,16 @@ class Codebird
      */
     protected $_version = '2.4.2-dev';
 
+    /**
+     * Request timeout
+     */
+    protected $_timeout;
+
+    /**
+     * Connection timeout
+     */
+    protected $_connectionTimeout;
+
     /**
      * Returns singleton class instance
      * Always use this method unless you're working with multiple authenticated users at once
@@ -173,6 +183,30 @@ public function setToken($token, $secret)
         $this->_oauth_token_secret = $secret;
     }
 
+    /**
+     * Sets request timeout in milliseconds
+     *
+     * @param int $timeout Request timeout in milliseconds
+     *
+     * @return void
+     */
+    public function setTimeout($timeout)
+    {
+        $this->_timeout = (int) $timeout;
+    }
+
+    /**
+     * Sets connection timeout in milliseconds
+     *
+     * @param int $timeout Connection timeout in milliseconds
+     *
+     * @return void
+     */
+    public function setConnectionTimeout($timeout)
+    {
+        $this->_connectionTimeout = (int) $timeout;
+    }
+
     /**
      * Sets the format for API replies
      *
@@ -905,6 +939,14 @@ protected function _callApi($httpmethod, $method, $method_template, $params = ar
         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
         curl_setopt($ch, CURLOPT_CAINFO, __DIR__ . '/cacert.pem');
 
+        if (isset($this->_timeout)) {
+            curl_setopt($ch, CURLOPT_TIMEOUT_MS, $this->_timeout);
+        }
+
+        if (isset($this->_connectionTimeout)) {
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT_MS, $this->_connectionTimeout);
+        }
+
         $reply = curl_exec($ch);
 
         // certificate validation results
