diff options
| author | Elmer Thomas <elmer@ThinkingSerious.com> | 2016-11-17 14:41:28 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-17 14:41:28 -0800 |
| commit | 7e29e6b7333a2f8951a9dd2b0f1f9f98adc89123 (patch) | |
| tree | a97a513d6249a3c35259b9ad2e3224ad747d1cd6 | |
| parent | aa09fb89e2be2624de9db4dde914d27cbdece95c (diff) | |
| parent | abe31d57608bf4df6863e48e4c26cf5be24266b4 (diff) | |
| download | php-http-client-7e29e6b7333a2f8951a9dd2b0f1f9f98adc89123.zip php-http-client-7e29e6b7333a2f8951a9dd2b0f1f9f98adc89123.tar.gz php-http-client-7e29e6b7333a2f8951a9dd2b0f1f9f98adc89123.tar.bz2 | |
Merge pull request #13 from emilva/fix_curl_options_array
#12 change from to php union operator to combine curl options
| -rw-r--r-- | lib/Client.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Client.php b/lib/Client.php index 1e77470..a383cc0 100644 --- a/lib/Client.php +++ b/lib/Client.php @@ -141,12 +141,12 @@ class Client { $curl = curl_init($url); - curl_setopt_array($curl, array_merge([ + curl_setopt_array($curl, [ CURLOPT_RETURNTRANSFER => true, CURLOPT_HEADER => 1, CURLOPT_CUSTOMREQUEST => strtoupper($method), CURLOPT_SSL_VERIFYPEER => false, - ], $this->curlOptions)); + ] + $this->curlOptions); if (isset($headers)) { $this->headers = array_merge($this->headers, $headers); |