Skip to content

Commit 55ac666

Browse files
committed
CurlService should set its headers first so user's extraOptions can override
1 parent 82b1947 commit 55ac666

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
@@ -51,8 +51,8 @@ public function execute($requestMethod, $url, $parameters = null, $extraOptions
5151

5252
case 'POST':
5353
case 'PUT':
54-
$parameters = ! $parameters || ! is_array($parameters)
55-
? '{}'
54+
$parameters = ! $parameters || ! is_array($parameters)
55+
? '{}' // instead of json_encode(new \stdclass))
5656
: json_encode($parameters);
5757

5858
curl_setopt($curl, CURLOPT_POSTFIELDS, $parameters);
@@ -71,12 +71,12 @@ public function execute($requestMethod, $url, $parameters = null, $extraOptions
7171
break;
7272
}
7373

74+
curl_setopt($curl, CURLOPT_HTTPHEADER, $customHeaders);
75+
7476
foreach ($extraOptions as $option => $value) {
7577
curl_setopt($curl, $option, $value);
7678
}
7779

78-
curl_setopt($curl, CURLOPT_HTTPHEADER, $customHeaders);
79-
8080
$rawResult = trim(curl_exec($curl));
8181

8282
$info = curl_getinfo($curl);

0 commit comments

Comments
 (0)