strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Initialize $curlOptions[CURLOPT_HTTPHEADER] outside of the checks

Browse source
This commit is contained in:
Philipp Holzer 2021-08-22 22:49:55 +02:00
parent c3eca0cfae
commit ff2d85b703
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Network/HTTPRequest.php
View file

@ -108,7 +108,7 @@ class HTTPRequest implements IHTTPRequest
$curlOptions = []; $curlOptions = [];
if (!empty($opts['cookiejar'])) { if (!empty($opts['cookiejar'])) {
$curlOptions[CURLOPT_COOKIEJAR] = $opts["cookiejar"]; $curlOptions[CURLOPT_COOKIEJAR] = $opts["cookiejar"];
$curlOptions[CURLOPT_COOKIEFILE] = $opts["cookiejar"]; $curlOptions[CURLOPT_COOKIEFILE] = $opts["cookiejar"];
} }
@ -116,22 +116,18 @@ class HTTPRequest implements IHTTPRequest
// $curlOptions[CURLOPT_FOLLOWLOCATION] =true; // $curlOptions[CURLOPT_FOLLOWLOCATION] =true;
// $curlOptions[CURLOPT_MAXREDIRS] = 5; // $curlOptions[CURLOPT_MAXREDIRS] = 5;
$curlOptions[CURLOPT_HTTPHEADER] = [];
if (!empty($opts['accept_content'])) { if (!empty($opts['accept_content'])) {
if (empty($curlOptions[CURLOPT_HTTPHEADER])) {
$curlOptions[CURLOPT_HTTPHEADER] = [];
}
array_push($curlOptions[CURLOPT_HTTPHEADER], 'Accept: ' . $opts['accept_content']); array_push($curlOptions[CURLOPT_HTTPHEADER], 'Accept: ' . $opts['accept_content']);
} }
if (!empty($opts['header'])) { if (!empty($opts['header'])) {
if (empty($curlOptions[CURLOPT_HTTPHEADER])) {
$curlOptions[CURLOPT_HTTPHEADER] = [];
}
$curlOptions[CURLOPT_HTTPHEADER] = array_merge($opts['header'], $curlOptions[CURLOPT_HTTPHEADER]); $curlOptions[CURLOPT_HTTPHEADER] = array_merge($opts['header'], $curlOptions[CURLOPT_HTTPHEADER]);
} }
$curlOptions[CURLOPT_RETURNTRANSFER] = true; $curlOptions[CURLOPT_RETURNTRANSFER] = true;
$curlOptions[CURLOPT_USERAGENT] = $this->getUserAgent(); $curlOptions[CURLOPT_USERAGENT] = $this->getUserAgent();
$range = intval($this->config->get('system', 'curl_range_bytes', 0)); $range = intval($this->config->get('system', 'curl_range_bytes', 0));
@ -146,9 +142,6 @@ class HTTPRequest implements IHTTPRequest
if (!empty($opts['headers'])) { if (!empty($opts['headers'])) {
$this->logger->notice('Wrong option \'headers\' used.'); $this->logger->notice('Wrong option \'headers\' used.');
if (empty($curlOptions[CURLOPT_HTTPHEADER])) {
$curlOptions[CURLOPT_HTTPHEADER] = [];
}
$curlOptions[CURLOPT_HTTPHEADER] = array_merge($opts['headers'], $curlOptions[CURLOPT_HTTPHEADER]); $curlOptions[CURLOPT_HTTPHEADER] = array_merge($opts['headers'], $curlOptions[CURLOPT_HTTPHEADER]);
} }