Check that set_time_limit is not disabled before calling it

Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>

diff --git a/apps/dav/appinfo/v1/webdav.php b/apps/dav/appinfo/v1/webdav.php
index 5ad11ceada86cef0a102b16014c0700bf975c2c7..32f93b2776026adfbb4cd510f4eae7d0bd03d4da 100644 (file)
--- a/apps/dav/appinfo/v1/webdav.php
+++ b/apps/dav/appinfo/v1/webdav.php
@@ -24,7 +24,9 @@
  */
 
 // no php execution timeout for webdav
-set_time_limit(0);
+if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+       @set_time_limit(0);
+}
 ignore_user_abort(true);
 
 // Turn off output buffering to prevent memory problems

diff --git a/apps/dav/appinfo/v2/remote.php b/apps/dav/appinfo/v2/remote.php
index b4a6578a41a8f94efac93eea7538cc9854bf1be1..3a00c8006ec771aef7cd0985f6475f631dc1ffb1 100644 (file)
--- a/apps/dav/appinfo/v2/remote.php
+++ b/apps/dav/appinfo/v2/remote.php
@@ -20,7 +20,9 @@
  *
  */
 // no php execution timeout for webdav
-set_time_limit(0);
+if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+       @set_time_limit(0);
+}
 ignore_user_abort(true);
 
 // Turn off output buffering to prevent memory problems

diff --git a/console.php b/console.php
index fb410ee6983fdc7f70505b18a44ddcba03155383..47cc2edf0180b10ee4e8ffb40e0e949408a0faf6 100644 (file)
--- a/console.php
+++ b/console.php
@@ -48,7 +48,9 @@ try {
        require_once __DIR__ . '/lib/base.php';
 
        // set to run indefinitely if needed
-       set_time_limit(0);
+       if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+               @set_time_limit(0);
+       }
 
        if (!OC::$CLI) {
                echo "This script can be run from the command line only" . PHP_EOL;

diff --git a/core/ajax/update.php b/core/ajax/update.php
index fca40477d60e056fbfbf54357582406b2769347d..37abdc5dc3bbe590a9232ebd65bc86e91a99e27b 100644 (file)
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -29,7 +29,10 @@
  */
 use Symfony\Component\EventDispatcher\GenericEvent;
 
-set_time_limit(0);
+if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+       @set_time_limit(0);
+}
+
 require_once '../../lib/base.php';
 
 $l = \OC::$server->getL10N('core');

diff --git a/cron.php b/cron.php
index feb680bd9c2f0815b7fbbe50ac678aff7f8f4d83..f6c52446d3ce2caf3f66c32faba4b4859fc05ab3 100644 (file)
--- 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')) {

diff --git a/lib/base.php b/lib/base.php
index 68178b06c5bdfa5f7825fcde19f8badbb27048fa..04b6d82b1df574d26233e5e2239b6b4c82a4b3b7 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -616,7 +616,9 @@ class OC {
                //Let´s try to overwrite some defaults anyway
 
                //try to set the maximum execution time to 60min
-               @set_time_limit(3600);
+               if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+                       @set_time_limit(3600);
+               }
                @ini_set('max_execution_time', 3600);
                @ini_set('max_input_time', 3600);
 

diff --git a/lib/private/legacy/files.php b/lib/private/legacy/files.php
index 8c9adad0d4986322bad840034e7d1168a4d3da86..ed3aa7194095522f5e761bc4c13712440619f257 100644 (file)
--- a/lib/private/legacy/files.php
+++ b/lib/private/legacy/files.php
@@ -147,7 +147,9 @@ class OC_Files {
 
                        $streamer->sendHeaders($name);
                        $executionTime = intval(OC::$server->getIniWrapper()->getNumeric('max_execution_time'));
-                       set_time_limit(0);
+                       if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+                               @set_time_limit(0);
+                       }
                        ignore_user_abort(true);
                        if ($getType === self::ZIP_FILES) {
                                foreach ($files as $file) {

diff --git a/settings/Controller/EncryptionController.php b/settings/Controller/EncryptionController.php
index cda50853fdcb01dc67fcbef571f45896bbe5db8d..0c8dd529a7da22dd15be1bad753c14763d27c33e 100644 (file)
--- a/settings/Controller/EncryptionController.php
+++ b/settings/Controller/EncryptionController.php
@@ -105,7 +105,9 @@ class EncryptionController extends Controller {
         */
        public function startMigration() {
         // allow as long execution on the web server as possible
-               set_time_limit(0);
+               if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+                       @set_time_limit(0);
+               }
 
                try {