Commit 6b540584 authored by Bas de Nooijer's avatar Bas de Nooijer

Merge pull request #358 from keesschepers/develop

Make it possible to bypass proxy.
parents 099f57ca e966d913
......@@ -122,7 +122,7 @@ class Curl extends Configurable implements AdapterInterface
curl_setopt($handler, CURLOPT_TIMEOUT, $options['timeout']);
curl_setopt($handler, CURLOPT_CONNECTTIMEOUT, $options['timeout']);
if ($proxy = $this->getOption('proxy')) {
if (null !== ($proxy = $this->getOption('proxy'))) {
curl_setopt($handler, CURLOPT_PROXY, $proxy);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment