wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update lib/util.php

Browse source 
getUrlContent should take proxy setting into consideration when not using curl, as well
This commit is contained in:
irgsmirx 2012-12-20 12:01:11 +01:00
parent ecf82d2218
commit 1e3231c732
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);
}