Include set_time_limit in a try/catch

getgrav · Nov 26, 2015 · ae39aab · ae39aab · vladdu · Nov 26, 2015
1 parent 6389066
commit ae39aab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/system/src/Grav/Common/GPM/Response.php b/system/src/Grav/Common/GPM/Response.php
@@ -78,10 +78,9 @@ public static function get($uri = '', $options = [], $callback = null)
             throw new \RuntimeException('Could not start an HTTP request. `allow_url_open` is disabled and `cURL` is not available');
         }
 
-        // disable time limit if possible to help with slow downloads
-        if (!Utils::isFunctionDisabled('set_time_limit') && !ini_get('safe_mode')) {
+        try {
             set_time_limit(0);
-        }
+        } catch (\Exception $e) {}
 
         $options = array_replace_recursive(self::$defaults, $options);
         $method  = 'get' . ucfirst(strtolower(self::$method));

diff --git a/system/src/Grav/Common/Utils.php b/system/src/Grav/Common/Utils.php
@@ -218,10 +218,9 @@ public static function download($file, $force_download = true)
             $file_parts = pathinfo($file);
             $filesize = filesize($file);
 
-            // check if this function is available, if so use it to stop any timeouts
-            if (function_exists('set_time_limit')) {
+            try {
                 set_time_limit(0);
-            }
+            } catch (\Exception $e) {}
 
             ignore_user_abort(false);