Merge branch 'MDL-38170-master' of git://github.com/sammarshallou/moodle

[moodle.git] / lib / filelib.php

diff --git a/lib/filelib.php b/lib/filelib.php
index dbf30eb..fc69751 100644 (file)
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -3078,6 +3078,12 @@ class curl {
         }
         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);