summaryrefslogtreecommitdiffstats
path: root/cron.php
diff options
context:
space:
mode:
authorKo- <k.stoffelen@cs.ru.nl>2017-03-11 17:04:21 +0100
committerKo- <k.stoffelen@cs.ru.nl>2017-03-11 17:04:21 +0100
commit0024b67aaf1b5fd79a2e73789a4c903364162e54 (patch)
treec01ec94b8d871b0905ed550391ac7be5e5b10e52 /cron.php
parent801b600ec348edab2447866b349a0d163db94f15 (diff)
downloadnextcloud-server-0024b67aaf1b5fd79a2e73789a4c903364162e54.tar.gz
nextcloud-server-0024b67aaf1b5fd79a2e73789a4c903364162e54.zip
Check that set_time_limit is not disabled before calling it
Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>
Diffstat (limited to 'cron.php')
-rw-r--r--cron.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/cron.php b/cron.php
index feb680bd9c2..f6c52446d3c 100644
--- a/cron.php
+++ b/cron.php
@@ -84,7 +84,9 @@ try {
if (OC::$CLI) {
// set to run indefinitely if needed
- set_time_limit(0);
+ if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+ @set_time_limit(0);
+ }
// the cron job must be executed with the right user
if (!function_exists('posix_getuid')) {