Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

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

diff --git a/lib/default.php b/lib/default.php
index 52a4ec7836e7a7d4b76259525235fa94df38a821..754cf5728b28c0d2d9164fae73d933ac032eb0e6 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -309,5 +309,8 @@ $default =
         'url' =>
         array('shortener' => 'ur1.ca',
               'maxlength' => 25,
-              'maxnoticelength' => -1)
+              'maxnoticelength' => -1),
+        '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')
+              ),
         );