upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Simpler version as proposed by @artonage

Browse source 
Co-authored-by: Louis <6653109+artonge@users.noreply.github.com>
Signed-off-by: Micke Nordin <kano@sunet.se>
This commit is contained in:
Mikael Nordin 2022-04-30 16:30:11 +02:00 committed by Micke Nordin
parent 259664468a
commit 30fe91a77f
No known key found for this signature in database
GPG key ID: 0DA0A7A5708FE257
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/base.php
View file

@ -627,27 +627,18 @@ class OC {
//try to configure php to enable big file uploads.
//this doesn´t work always depending on the webserver and php configuration.
//Let´s try to overwrite some defaults if they are smaller than 1 hour
// One hour is 3600 seconds
$time_limit = 3600;
$max_execution_time_from_ini = @ini_get('max_execution_time');
$biggest_max_execution_time = $time_limit;
if (isset($max_execution_time_from_ini)) {
$biggest_max_execution_time = max($time_limit, intval($max_execution_time_from_ini));
if (intval(@ini_get('max_execution_time')?? 0) < 3600) {
@ini_set('max_execution_time', strval(3600));
}
@ini_set('max_execution_time', strval($biggest_max_execution_time));
$max_input_time_from_ini = @ini_get('max_input_time');
$biggest_max_input_time = $time_limit;
if (isset($max_input_time_from_ini)) {
$biggest_max_input_time = max($time_limit, intval($max_input_time_from_ini));
if (intval(@ini_get('max_input_time')?? 0) < 3600) {
@ini_set('max_input_time', strval(3600));
}
@ini_set('max_input_time', strval($biggest_max_input_time));
//try to set the maximum execution time to the largest time limit we have
if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
$biggest_time_limit = max($time_limit, $biggest_max_execution_time, $biggest_max_input_time);
@set_time_limit($biggest_time_limit);
@set_time_limit(strval(max(intval(@ini_get('max_execution_time')),intval(@ini_get('max_input_time')))));
}
self::setRequiredIniValues();