From: Evan Prodromou <evan@status.net>
Date: Fri, 13 Aug 2010 21:33:41 +0000 (-0700)
Subject: Merge branch 'master' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=718317542940a8976f2c6f2a9ea09a04f2f00ca6;p=quix0rs-gnu-social.git

Merge branch 'master' into 1.0.x
---

718317542940a8976f2c6f2a9ea09a04f2f00ca6
diff --cc lib/default.php
index e0081f3165,45a4560ff3..76e4e44cf2
--- a/lib/default.php
+++ b/lib/default.php
@@@ -316,11 -314,8 +316,12 @@@ $default 
          array('subscribers' => true,
                'members' => true,
                'peopletag' => true),
 +        'url' =>
 +        array('shortener' => 'ur1.ca',
 +              '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.)
                ),
          );