Fix #330: Fix curlOptions merging

yuniorsk · web-flow · commit 483baaec6bbf · 2023-02-09T12:01:54.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ Yii Framework 2 Elasticsearch extension Change Log
 2.1.4 under development
 -----------------------
 - Enh #329: Added `curlOptions` attribute for advanced configuration of curl session (yuniorsk)
+- Bug #330: Fix `curlOptions` merging (yuniorsk)
 
 2.1.3 August 07, 2022
 -----------------------
diff --git a/Connection.php b/Connection.php
@@ -459,8 +459,8 @@ protected function httpRequest($method, $url, $requestBody = null, $raw = false)
             CURLOPT_FORBID_REUSE   => false,
         ];
 
-        if (!empty($this->curlOptions)) {
-            $options = array_merge($options, $this->curlOptions);
+        foreach ($this->curlOptions as $key => $value) {
+            $options[$key] = $value;
         }
 
         if (!empty($this->auth) || isset($this->nodes[$this->activeNode]['auth']) && $this->nodes[$this->activeNode]['auth'] !== false) {

Original file line number	Diff line number	Diff line change
`@@ -459,8 +459,8 @@ protected function httpRequest($method, $url, $requestBody = null, $raw = false)`
`459`	`459`	`CURLOPT_FORBID_REUSE => false,`
`460`	`460`	`];`
`461`	`461`
`462`		`- if (!empty($this->curlOptions)) {`
`463`		`- $options = array_merge($options, $this->curlOptions);`
	`462`	`+ foreach ($this->curlOptions as $key => $value) {`
	`463`	`+ $options[$key] = $value;`
`464`	`464`	`}`
`465`	`465`
`466`	`466`	`if (!empty($this->auth) \|\| isset($this->nodes[$this->activeNode]['auth']) && $this->nodes[$this->activeNode]['auth'] !== false) {`