Merge branch 'nightly' into 'nightly'

[quix0rs-gnu-social.git] / lib / default.php

diff --git a/lib/default.php b/lib/default.php
index 74ab982958e1eb6ce7483b754b3860cfec916913..6420a05e5f387c6717b89bbbd41c1a4df64d079e 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -98,6 +98,7 @@ $default =
         'queue' =>
         array('enabled' => true,
               'daemon' => false, # Use queuedaemon. Default to false
+              'threads' => null,    # an empty value here uses processor count to determine
               'subsystem' => 'db', # default to database, or 'stomp'
               'stomp_server' => null,
               'queue_basename' => '/queue/statusnet/',
@@ -297,7 +298,7 @@ $default =
         'group' =>
         array('maxaliases' => 3,
               'desclimit' => null,
-              'addtag' => false),
+              'addtag' => true),
         'peopletag' =>
         array('maxtags' => 100, // maximum number of tags a user can create.
               'maxpeople' => 500, // maximum no. of people with the same tag by the same user
@@ -345,6 +346,7 @@ $default =
               'default' => array(
                             'Activity' => array(),
                             'AntiBrute' => array(),
+                            'Blacklist' => array(),
                             'Bookmark' => array(),
                             'ClientSideShorten' => array(),
                             'DefaultLayout' => array(),
@@ -392,6 +394,7 @@ $default =
               'ssl_verify_host' => true,    // HTTPRequest2 makes sure this is set to CURLOPT_SSL_VERIFYHOST==2 if using curl
               'curl' => false, // Use CURL backend for HTTP fetches if available. (If not, PHP's socket streams will be used.)
               'connect_timeout' => 5,
+              'timeout' => intval(ini_get('default_socket_timeout')),   // effectively should be this by default already, but this makes it more explicitly configurable for you users .)
               'proxy_host' => null,
               'proxy_port' => null,
               'proxy_user' => null,