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 467e41575825013b5855b5c61ac4b5e2fb4beb6c..d0b8262ac76fbad76faa84d99c1f0439db2a5589 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -132,6 +132,10 @@ return [
                // The value has to start with the scheme and end with a "/"
                'avatar_cache_url' => '',
 
+               // basicauth (Boolean)
+               // Controls if login via BasicAuth is possible (default is true)
+               'basicauth' => true,
+
                // big_emojis (Boolean)
                // Display "Emoji Only" posts in big.
                'big_emojis' => false,
@@ -337,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,
@@ -520,7 +532,7 @@ return [
                'profiler' => false,
 
                // pushpoll_frequency (Integer)
-               // Frequency of contact poll for subhub contact using the DFRM or OStatus network.
+               // Frequency of contact poll for subhub contact using the DFRN or OStatus network.
                // Available values:
                // - 5 = every month
                // - 4 = every week