MDL-38168 Filelib: Curl class does not honour proxybypass option

2013-02-22 14:20:04 +00:00
parent 56d22f190e
commit aee5f1f4d8
1 changed files with 6 additions and 0 deletions
@@ -3057,6 +3057,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);