Skip to content

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

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

parents 7700fc87 809e6e10
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
library/Solarium/Core/Client/Adapter/Curl.php
View file @ a77e8078
...@@ -148,6 +148,10 @@ class Curl extends Configurable implements AdapterInterface ...@@ -148,6 +148,10 @@ class Curl extends Configurable implements AdapterInterface
curl_setopt($handler, CURLOPT_FOLLOWLOCATION, true); curl_setopt($handler, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($handler, CURLOPT_TIMEOUT, $options['timeout']); curl_setopt($handler, CURLOPT_TIMEOUT, $options['timeout']);
if ( $proxy = $this->getOption('proxy') ) {
curl_setopt($handler, CURLOPT_PROXY, $proxy);
}
if (!isset($options['headers']['Content-Type'])) { if (!isset($options['headers']['Content-Type'])) {
$options['headers']['Content-Type'] = 'text/xml; charset=utf-8'; $options['headers']['Content-Type'] = 'text/xml; charset=utf-8';
} }
......
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