diff options
author | Evan Prodromou <evan@status.net> | 2010-05-21 16:47:57 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-05-21 16:47:57 -0400 |
commit | 6d8e01ad13dd9bc9e149f43a1eb88671d4737f4d (patch) | |
tree | 12f8b318971d1a1eebbb318e3c19142a56dce444 /lib/default.php | |
parent | 8a2144aeed2e338ef1b21425b9387086790aa820 (diff) | |
parent | bbfd6eff0c69f038d151d3bf6c8bf9b45a64716f (diff) |
Merge branch 'master' of gitorious.org:statusnet/mainline
Diffstat (limited to 'lib/default.php')
-rw-r--r-- | lib/default.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/default.php b/lib/default.php index fa4ece10a..950c6018d 100644 --- a/lib/default.php +++ b/lib/default.php @@ -188,7 +188,8 @@ $default = 'cache' => array('base' => null), 'ping' => - array('notify' => array()), + array('notify' => array(), + 'timeout' => 2), 'inboxes' => array('enabled' => true), # ignored after 0.9.x 'newuser' => @@ -303,4 +304,7 @@ $default = array('subscribers' => true, 'members' => true, 'peopletag' => true), + 'http' => // HTTP client settings when contacting other sites + array('ssl_cafile' => false // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt') + ), ); |