Skip to content

Commit 505688d

Browse files
JMLamodierepolyfractal
authored andcommitted
fix: conflict when merging timeout param (#562)
Closes #561
1 parent 9606f52 commit 505688d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Elasticsearch/Connections/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public function performRequest($method, $uri, $params = null, $body = null, $opt
160160
], $this->headers)
161161
];
162162

163-
$request = array_merge_recursive($request, $this->connectionParams, $options);
163+
$request = array_replace_recursive($request, $this->connectionParams, $options);
164164

165165
// RingPHP does not like if client is empty
166166
if (empty($request['client'])) {

0 commit comments

Comments
 (0)