fix for #2 & #3

codemasher · codemasher · commit 5afc32711d90 · 2019-03-22T23:45:05.000+01:00
diff --git a/src/Psr18/CurlHandle.php b/src/Psr18/CurlHandle.php
@@ -247,7 +247,11 @@ public function init(){
 		}
 
 		// overwrite the default values with $curl_options
-		\curl_setopt_array($this->curl, $options + $this->options->curl_options);
+		foreach($this->options->curl_options as $k => $v){
+			$options[$k] = $v;
+		}
+
+		\curl_setopt_array($this->curl, $options);
 
 		return $this->curl;
 	}

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,11 @@ public function init(){`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`// overwrite the default values with $curl_options`
`250`		`- \curl_setopt_array($this->curl, $options + $this->options->curl_options);`
	`250`	`+ foreach($this->options->curl_options as $k => $v){`
	`251`	`+ $options[$k] = $v;`
	`252`	`+ }`
	`253`	`+`
	`254`	`+ \curl_setopt_array($this->curl, $options);`
`251`	`255`
`252`	`256`	`return $this->curl;`
`253`	`257`	`}`