Skip to content

S
solarium
Commit e1b758f8 authored by Bas de Nooijer's avatar Bas de Nooijer
Browse files
Options

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

parents ad6e9508 6b540584
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
library/Solarium/Core/Client/Adapter/Curl.php
View file @ e1b758f8
...@@ -122,7 +122,7 @@ class Curl extends Configurable implements AdapterInterface ...@@ -122,7 +122,7 @@ class Curl extends Configurable implements AdapterInterface
curl_setopt($handler, CURLOPT_TIMEOUT, $options['timeout']); curl_setopt($handler, CURLOPT_TIMEOUT, $options['timeout']);
curl_setopt($handler, CURLOPT_CONNECTTIMEOUT, $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); 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