diff options
| author | Mikael Nordin <mickenordin@users.noreply.github.com> | 2022-04-30 16:30:11 +0200 |
|---|---|---|
| committer | backportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com> | 2022-08-22 22:00:27 +0000 |
| commit | 7fee1078f263e50575b869da27698cec940210bf (patch) | |
| tree | fdf967d8e3e93b7f06803a1e9b7b21956b1bbcea /lib | |
| parent | 4092599d15892f6f31dccfefb811b5966acaccc4 (diff) | |
| download | nextcloud-server-7fee1078f263e50575b869da27698cec940210bf.tar.gz nextcloud-server-7fee1078f263e50575b869da27698cec940210bf.zip | |
Simpler version as proposed by @artonage
Co-authored-by: Louis <6653109+artonge@users.noreply.github.com>
Signed-off-by: Micke Nordin <kano@sunet.se>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index 9c0ab305f79..fc96737db0a 100644 --- a/lib/base.php +++ b/lib/base.php @@ -616,8 +616,7 @@ class OC { //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(); |