Don't trust local HTML either

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

diff --git a/lib/default.php b/lib/default.php
index 7894dbb6745e4027be32f9351119f171fce0cce2..8d8ef1178810a98a8806b75d8969f03acafb3f5d 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -140,11 +140,6 @@ $default =
               'path' => $_path . '/avatar/',
               'ssl' => null,
               'maxsize' => 300),
-        'background' =>
-        array('server' => null,
-              'dir' => INSTALLDIR . '/background/',
-              'path' => $_path . '/background/',
-              'ssl' => null),
         'public' =>
         array('localonly' => false,
               'blacklist' => array(),
@@ -358,6 +353,7 @@ $default =
         array('ssl_cafile' => false, // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt') (this activates "ssl_verify_peer")
               'ssl_verify_host' => true,    // HTTPRequest2 makes sure this is set to CURLOPT_SSL_VERIFYHOST==2 if using curl
               'curl' => false, // Use CURL backend for HTTP fetches if available. (If not, PHP's socket streams will be used.)
+              'connect_timeout' => 5,
               'proxy_host' => null,
               'proxy_port' => null,
               'proxy_user' => null,