Cadoles/BeSimpleSoap
21
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge branch 'fixed_tests'

Browse Source
This commit is contained in:
Francis Besset
2014-08-14 13:39:12 +02:00
parent 8d13d2dd5c e676eb0432
commit fe67cff5ff
15 changed files with 150 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/BeSimple/SoapClient/Curl.php
View File

@ -81,8 +81,13 @@ class Curl
curl_setopt($this->ch, CURLOPT_CONNECTTIMEOUT, $options['connection_timeout']);
}
if (isset($options['proxy_host'])) {
$port = isset($options['proxy_port']) ? $options['proxy_port'] : 8080;
curl_setopt($this->ch, CURLOPT_PROXY, $options['proxy_host'] . ':' . $port);
if (false !== $options['proxy_host']) {
$proxyHost = $options['proxy_host'].(isset($options['proxy_port']) ? $options['proxy_port'] : 8080);
} else {
$proxyHost = false;
}
curl_setopt($this->ch, CURLOPT_PROXY, $proxyHost);
}
if (isset($options['proxy_user'])) {
curl_setopt($this->ch, CURLOPT_PROXYUSERPWD, $options['proxy_user'] . ':' . $options['proxy_password']);
@ -321,4 +326,4 @@ class Curl
return trim(array_pop($matches));
}
}
}