Skip to content

[stable24] Respect user settings in php.ini if they are big enough #33644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 3 commits into from
Aug 23, 2022
Merged

[stable24] Respect user settings in php.ini if they are big enough #33644

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab7a5de
Respect user settings in php.ini if they are big enough
mickenordin Apr 29, 2022
da6e0d7
Simpler version as proposed by @artonage
mickenordin Apr 30, 2022
47fd27b
Fix suggestions by @artonage
mickenordin May 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Simpler version as proposed by @artonage 
Co-authored-by: Louis <[email protected]>
Signed-off-by: Micke Nordin <[email protected]>
  • Loading branch information
@mickenordin @artonge @backportbot-nextcloud
2 people authored and backportbot-nextcloud[bot] committed Aug 22, 2022
commit da6e0d7ddb44802c04aac6f0f95bb648e9e11b2b
19 changes: 5 additions & 14 deletions lib/base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,27 +627,18 @@ public static function init() {
//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();
Expand Down