Merge branch 'master' into 1.0.x

2010-08-13 14:33:41 -07:00
parent 9f0715a993 029aa0c61c
commit 7183175429
78 changed files with 11330 additions and 2668 deletions
--- a/lib/default.php
+++ b/lib/default.php
@@ -321,6 +321,7 @@ $default =
              'maxlength' => 25,
              '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')
+        array('ssl_cafile' => false, // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt')
+              'curl' => false, // Use CURL backend for HTTP fetches if available. (If not, PHP's socket streams will be used.)
              ),
        );