Check that set_time_limit is not disabled before calling it
Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>
This commit is contained in:
parent
801b600ec3
commit
0024b67aaf
|
@ -24,7 +24,9 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// no php execution timeout for webdav
|
// 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);
|
ignore_user_abort(true);
|
||||||
|
|
||||||
// Turn off output buffering to prevent memory problems
|
// Turn off output buffering to prevent memory problems
|
||||||
|
|
|
@ -20,7 +20,9 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
// no php execution timeout for webdav
|
// 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);
|
ignore_user_abort(true);
|
||||||
|
|
||||||
// Turn off output buffering to prevent memory problems
|
// Turn off output buffering to prevent memory problems
|
||||||
|
|
|
@ -48,7 +48,9 @@ try {
|
||||||
require_once __DIR__ . '/lib/base.php';
|
require_once __DIR__ . '/lib/base.php';
|
||||||
|
|
||||||
// set to run indefinitely if needed
|
// 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) {
|
if (!OC::$CLI) {
|
||||||
echo "This script can be run from the command line only" . PHP_EOL;
|
echo "This script can be run from the command line only" . PHP_EOL;
|
||||||
|
|
|
@ -29,7 +29,10 @@
|
||||||
*/
|
*/
|
||||||
use Symfony\Component\EventDispatcher\GenericEvent;
|
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';
|
require_once '../../lib/base.php';
|
||||||
|
|
||||||
$l = \OC::$server->getL10N('core');
|
$l = \OC::$server->getL10N('core');
|
||||||
|
|
4
cron.php
4
cron.php
|
@ -84,7 +84,9 @@ try {
|
||||||
|
|
||||||
if (OC::$CLI) {
|
if (OC::$CLI) {
|
||||||
// set to run indefinitely if needed
|
// 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
|
// the cron job must be executed with the right user
|
||||||
if (!function_exists('posix_getuid')) {
|
if (!function_exists('posix_getuid')) {
|
||||||
|
|
|
@ -616,7 +616,9 @@ class OC {
|
||||||
//Let´s try to overwrite some defaults anyway
|
//Let´s try to overwrite some defaults anyway
|
||||||
|
|
||||||
//try to set the maximum execution time to 60min
|
//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_execution_time', 3600);
|
||||||
@ini_set('max_input_time', 3600);
|
@ini_set('max_input_time', 3600);
|
||||||
|
|
||||||
|
|
|
@ -147,7 +147,9 @@ class OC_Files {
|
||||||
|
|
||||||
$streamer->sendHeaders($name);
|
$streamer->sendHeaders($name);
|
||||||
$executionTime = intval(OC::$server->getIniWrapper()->getNumeric('max_execution_time'));
|
$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);
|
ignore_user_abort(true);
|
||||||
if ($getType === self::ZIP_FILES) {
|
if ($getType === self::ZIP_FILES) {
|
||||||
foreach ($files as $file) {
|
foreach ($files as $file) {
|
||||||
|
|
|
@ -105,7 +105,9 @@ class EncryptionController extends Controller {
|
||||||
*/
|
*/
|
||||||
public function startMigration() {
|
public function startMigration() {
|
||||||
// allow as long execution on the web server as possible
|
// 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 {
|
try {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue