fix: conflict when merging timeout param (#562)

Closes #561
elastic · Apr 12, 2017 · 505688d · 505688d
1 parent 9606f52
commit 505688d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Elasticsearch/Connections/Connection.php b/src/Elasticsearch/Connections/Connection.php
@@ -160,7 +160,7 @@ public function performRequest($method, $uri, $params = null, $body = null, $opt
             ], $this->headers)
         ];
 
-        $request = array_merge_recursive($request, $this->connectionParams, $options);
+        $request = array_replace_recursive($request, $this->connectionParams, $options);
 
         // RingPHP does not like if client is empty
         if (empty($request['client'])) {