mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Ko- 2017-03-11 17:04:21 +01:00
parent 801b600ec3
commit 0024b67aaf
8 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dav/appinfo/v1/webdav.php
View File

@ -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

4
apps/dav/appinfo/v2/remote.php
View File

@ -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

4
console.php
View File

@ -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;

5
core/ajax/update.php
View File

@ -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');

4
cron.php
View File

@ -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')) {

2
lib/base.php
View File

@ -616,7 +616,9 @@ class OC {
//Let´s try to overwrite some defaults anyway
//try to set the maximum execution time to 60min
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);

4
lib/private/legacy/files.php
View File

@ -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) {

4
settings/Controller/EncryptionController.php
View File

@ -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 {