Merge branch 'master' into 1.0.x

1 files changed, 2 insertions, 1 deletions

diff --git a/lib/default.php b/lib/default.php
index e0081f316..76e4e44cf 100644
--- 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.)
               ),
         );