mirror of
https://github.com/friendica/friendica
synced 2025-04-27 18:30:12 +00:00
Introduce settings for overriding php.ini values
This commit is contained in:
parent
44bdff664a
commit
bbe6554bb0
2 changed files with 16 additions and 4 deletions
12
src/App.php
12
src/App.php
|
@ -335,7 +335,14 @@ class App
|
|||
*/
|
||||
protected function load(DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition)
|
||||
{
|
||||
set_time_limit(0);
|
||||
if ($this->config->get('system', 'ini_max_execution_time') !== false) {
|
||||
set_time_limit((int)$this->config->get('system', 'ini_max_execution_time'));
|
||||
}
|
||||
|
||||
// This has to be quite large to deal with embedded private photos
|
||||
if ($this->config->get('system', 'ini_pcre_backtrack_limit') !== false) {
|
||||
ini_set('pcre.backtrack_limit', (int)$this->config->get('system', 'ini_pcre_backtrack_limit'));
|
||||
}
|
||||
|
||||
// Normally this constant is defined - but not if "pcntl" isn't installed
|
||||
if (!defined('SIGTERM')) {
|
||||
|
@ -345,9 +352,6 @@ class App
|
|||
// Ensure that all "strtotime" operations do run timezone independent
|
||||
date_default_timezone_set('UTC');
|
||||
|
||||
// This has to be quite large to deal with embedded private photos
|
||||
ini_set('pcre.backtrack_limit', 500000);
|
||||
|
||||
set_include_path(
|
||||
get_include_path() . PATH_SEPARATOR
|
||||
. $this->getBasePath() . DIRECTORY_SEPARATOR . 'include' . PATH_SEPARATOR
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue