Merge branch '0.9.x' into pluginize-twitter-bridge

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

diff --git a/lib/common.php b/lib/common.php
index 5652e986ed993ca9ed000e99423ae9524d80ba5e..f7c31c792bf4d549a91ecc4f76b3ec12611fa75c 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -284,6 +284,8 @@ $config =
         array('contentlimit' => null),
         'message' =>
         array('contentlimit' => null),
+        'http' =>
+        array('client' => 'curl'), // XXX: should this be the default?
         );
 
 $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');