Merge branch 'friendica:develop' into feature-openwebauth

[friendica.git] / static / defaults.config.php

diff --git a/static/defaults.config.php b/static/defaults.config.php
index 7e699fad714ba3f6a06368bd3c6fcd6fc0156ce3..d0b8262ac76fbad76faa84d99c1f0439db2a5589 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -341,6 +341,14 @@ return [
                // Resolve IPV4 addresses only. Don't resolve to IPV6.
                'ipv4_resolve' => false,
 
+               // ini_max_execution_time (False|Integer)
+               // Set the number of seconds a script is allowed to run. Default unlimited for Friendica, false to use the system value.
+               'ini_max_execution_time' => 0,
+
+               // ini_pcre_backtrack_limit (False|Integer)
+               // This has to be quite large to deal with embedded private photos. False to use the system value.
+               'ini_pcre_backtrack_limit' => 500000,
+
                // invitation_only (Boolean)
                // If set true registration is only possible after a current member of the node has sent an invitation.
                'invitation_only' => false,