upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-21 14:23:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merge pull request #32216 from SUNET/master

Browse source 
Respect user settings in php.ini if they are big enough
This commit is contained in:
Louis 2022-05-17 10:14:56 +02:00 committed by GitHub
commit 8ed92ad4f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/base.php
View file

@ -615,16 +615,23 @@ class OC {
throw new \RuntimeException('Could not set timezone to UTC');
}
//try to configure php to enable big file uploads.
//this doesn´t work always depending on the web server and php configuration.
//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);
//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
if (intval(@ini_get('max_execution_time') ?? 0) < 3600) {
@ini_set('max_execution_time', strval(3600));
}
if (intval(@ini_get('max_input_time') ?? 0) < 3600) {
@ini_set('max_input_time', strval(3600));
}
//try to set the maximum execution time to the largest time limit we have
if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
@set_time_limit(max(intval(@ini_get('max_execution_time')), intval(@ini_get('max_input_time'))));
}
@ini_set('max_execution_time', '3600');
@ini_set('max_input_time', '3600');
self::handleAuthHeaders();
$systemConfig = \OC::$server->get(\OC\SystemConfig::class);