Fix jublo#81 CURLOPT_TIMEOUT_MS and CURLOPT_CONNECTTIMEOUT_MS errors on PHP 5.3

mynetx · mynetx · commit a2b71ca54171 · 2014-09-04T12:03:09.000+02:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -7,6 +7,7 @@ codebird-php - changelog
 + #69 Add composer/installers to allow install path changes
 - Regression: Codebird::getApiMethods removed accidentally in 2.5.0
 + #66 Allow remote media uploads
+- #81 CURLOPT_TIMEOUT_MS and CURLOPT_CONNECTTIMEOUT_MS errors on PHP 5.3
 
 2.5.0 (2014-06-20)
 + Add section about cacert.pem to README
diff --git a/src/codebird.php b/src/codebird.php
@@ -26,7 +26,10 @@
     'CURLE_SSL_CACERT' => 60,
     'CURLE_SSL_CACERT_BADFILE' => 77,
     'CURLE_SSL_CRL_BADFILE' => 82,
-    'CURLE_SSL_ISSUER_ERROR' => 83
+    'CURLE_SSL_ISSUER_ERROR' => 83,
+    // workaround for http://php.net/manual/en/function.curl-setopt.php#107314
+    '_CURLOPT_TIMEOUT_MS' => 155,
+    '_CURLOPT_CONNECTTIMEOUT_MS' => 156
 );
 foreach ($constants as $id => $i) {
     defined($id) or define($id, $i);
@@ -1165,8 +1168,8 @@ protected function _buildMultipart($method, $params)
                         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
                         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
                         // use hardcoded download timeouts for now
-                        curl_setopt($ch, CURLOPT_TIMEOUT_MS, 5000);
-                        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT_MS, 2000);
+                        curl_setopt($ch, _CURLOPT_TIMEOUT_MS, 5000);
+                        curl_setopt($ch, _CURLOPT_CONNECTTIMEOUT_MS, 2000);
                         $result = curl_exec($ch);
                         if ($result !== false) {
                             $value = $result;
@@ -1329,11 +1332,11 @@ protected function _callApiCurl(
         curl_setopt($ch, CURLOPT_CAINFO, __DIR__ . '/cacert.pem');
 
         if (isset($this->_timeout)) {
-            curl_setopt($ch, CURLOPT_TIMEOUT_MS, $this->_timeout);
+            curl_setopt($ch, _CURLOPT_TIMEOUT_MS, $this->_timeout);
         }
 
         if (isset($this->_connectionTimeout)) {
-            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT_MS, $this->_connectionTimeout);
+            curl_setopt($ch, _CURLOPT_CONNECTTIMEOUT_MS, $this->_connectionTimeout);
         }
 
         $result = curl_exec($ch);
