Changeset 607

Timestamp:

Jun 25, 2017 7:12:54 AM (7 years ago)

Author:

anonymous

Message:

Fix CURLOPT_PROGRESSFUNCTION usage for php < 5.5.0

File:

• trunk/lib/Utilities.inc.php (modified) (1 diff)

trunk/lib/Utilities.inc.php

@@ -1467 +1467 @@
     curl_setopt($ch, CURLOPT_BUFFERSIZE, 128); // Frequent progress function calls.
     curl_setopt($ch, CURLOPT_NOPROGRESS, false); // Required to use CURLOPT_PROGRESSFUNCTION.
-    curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($ch, $dltot, $dlcur, $ultot, $ulcur){
-        // Return a non-zero value to abort the transfer. In which case, the transfer will set a CURLE_ABORTED_BY_CALLBACK error
-        // 10KB should be enough to catch a few 302 redirect headers and get to the actual content.
-        return ($dlcur > 10*1024) ? 1 : 0;
-    });
-
+    // Function arguments for CURLOPT_PROGRESSFUNCTION changed with php 5.5.0.
+    if (version_compare(PHP_VERSION, '5.5.0', '>=')) {
+        curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($ch, $dltot, $dlcur, $ultot, $ulcur){
+            // Return a non-zero value to abort the transfer. In which case, the transfer will set a CURLE_ABORTED_BY_CALLBACK error
+            // 10KB should be enough to catch a few 302 redirect headers and get to the actual content.
+            return ($dlcur > 10*1024) ? 1 : 0;
+        });
+    } else {
+        curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($dltot, $dlcur, $ultot, $ulcur){
+            // Return a non-zero value to abort the transfer. In which case, the transfer will set a CURLE_ABORTED_BY_CALLBACK error
+            // 10KB should be enough to catch a few 302 redirect headers and get to the actual content.
+            return ($dlcur > 10*1024) ? 1 : 0;
+        });
+    }
     curl_exec($ch);
     $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);