Permalink
Browse files

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

… into MOODLE_24_STABLE
  • Loading branch information...
2 parents 75822af + aee5f1f commit 4ea25c227c12955638ea9288d90da6e360f20fe2 Sam Hemelryk committed Mar 4, 2013
Showing with 6 additions and 0 deletions.
  1. +6 −0 lib/filelib.php
View
@@ -3057,6 +3057,12 @@ private function apply_opt($curl, $options) {
}
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){
echo '<h1>Options</h1>';
var_dump($this->options);

0 comments on commit 4ea25c2

Please sign in to comment.