add curl proxy support. Fixes #504

https://github.com/owncloud/core/issues/504

diff --git a/config/config.sample.php b/config/config.sample.php
index f531d5f146b2f80b290fbbed45bf98a9bc4fb361..c915a8772912009577e089a3a631f482648f0965 100644 (file)
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -42,6 +42,12 @@ $CONFIG = array(
 /* Time in seconds how long an user is authenticated without entering his password again before performing sensitive actions like creating or deleting users etc...*/
 "enhancedauthtime" => 15 * 60,
 
+/* A proxy to use to connect to the internet. For example "myproxy.org:88" */
+"curlproxy" => "",
+
+/* The optional authentication for the proxy to use to connect to the internet. The format is: [username]:[password] */
+"curlproxyuserpwd" => "",
+
 /* Theme to use for ownCloud */
 "theme" => "",
 

diff --git a/lib/util.php b/lib/util.php
index 34c4d4f9b116317159dea7c5efeb89bb000cf7ec..370e5dc13fc98a53831b47ea1015dfc38588c7ce 100755 (executable)
--- a/lib/util.php
+++ b/lib/util.php
@@ -696,6 +696,8 @@ class OC_Util {
                 curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10);
                 curl_setopt($curl, CURLOPT_URL, $url);
                curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler");
+                if(OC_Config::getValue('curlproxy','')=='') curl_setopt($curl, CURLOPT_PROXY, OC_Config::getValue('curlproxy'));
+                if(OC_Config::getValue('curlproxyuserpwd','')=='') curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('curlproxyuserpwd'));
                 $data = curl_exec($curl);
                 curl_close($curl);