Skip to content

Commit 3314cd8

Browse files
committed
CurlService should set its headers first so user's extraOptions can override
1 parent 1c4f303 commit 3314cd8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lib/WebDriver/Service/CurlService.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public function execute($requestMethod, $url, $parameters = null, $extraOptions
5454

5555
case 'POST':
5656
case 'PUT':
57-
$parameters = ! $parameters || ! is_array($parameters)
58-
? '{}'
57+
$parameters = ! $parameters || ! is_array($parameters)
58+
? '{}' // instead of json_encode(new \stdclass))
5959
: json_encode($parameters);
6060

6161
curl_setopt($curl, CURLOPT_POSTFIELDS, $parameters);
@@ -74,12 +74,12 @@ public function execute($requestMethod, $url, $parameters = null, $extraOptions
7474
break;
7575
}
7676

77+
curl_setopt($curl, CURLOPT_HTTPHEADER, $customHeaders);
78+
7779
foreach (array_replace($this->defaultOptions, $extraOptions) as $option => $value) {
7880
curl_setopt($curl, $option, $value);
7981
}
8082

81-
curl_setopt($curl, CURLOPT_HTTPHEADER, $customHeaders);
82-
8383
$rawResult = curl_exec($curl);
8484
$rawResult = is_string($rawResult) ? trim($rawResult) : '';
8585

0 commit comments

Comments
 (0)