moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-38168-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE

Browse source
This commit is contained in:
Sam Hemelryk 2013-03-04 13:35:00 +13:00
commit 4ea25c227c
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/filelib.php
View file

@ -3057,6 +3057,12 @@ class curl {
} }
curl_setopt($curl, CURLOPT_HTTPHEADER, $this->header); curl_setopt($curl, CURLOPT_HTTPHEADER, $this->header);
// Bypass proxy (for this request only) if required.
if (!empty($this->options['CURLOPT_URL']) &&
is_proxybypass($this->options['CURLOPT_URL'])) {
unset($this->options['CURLOPT_PROXY']);
}
if ($this->debug){ if ($this->debug){
echo '<h1>Options</h1>'; echo '<h1>Options</h1>';
var_dump($this->options); var_dump($this->options);