Merge branch 'develop' of github.com:solariumphp/solarium into develop

e1b758f8 · Bas de Nooijer · ad6e9508 · 6b540584 · e1b758f8
Commit e1b758f8 authored Sep 10, 2015 by Bas de Nooijer
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

library/Solarium/Core/Client/Adapter/Curl.php library/Solarium/Core/Client/Adapter/Curl.php +1 -1

No files found.
--- a/library/Solarium/Core/Client/Adapter/Curl.php
+++ b/library/Solarium/Core/Client/Adapter/Curl.php
@@ -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);
        }