mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #975 from irgsmirx/patch-1 

Update lib/util.php
This commit is contained in:
Thomas Müller 2013-01-02 14:01:38 -08:00
parent 8240717309 1e3231c732
commit 9dc5ea172e
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/util.php
View File

@ -688,14 +688,27 @@ class OC_Util {
curl_close($curl);
} else {
$ctx = stream_context_create(
array(
'http' => array(
'timeout' => 10
)
)
);
$contextArray = null;
if(OC_Config::getValue('proxy','')<>'') {
$contextArray = array(
'http' => array(
'timeout' => 10,
'proxy' => OC_Config::getValue('proxy')
)
);
} else {
$contextArray = array(
'http' => array(
'timeout' => 10
)
);
}
$ctx = stream_context_create(
$contextArray
);
$data=@file_get_contents($url, 0, $ctx);
}