friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Initialize $curlOptions[CURLOPT_HTTPHEADER] outside of the checks

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

11
src/Network/HTTPRequest.php
View File

@ -116,17 +116,13 @@ class HTTPRequest implements IHTTPRequest
// $curlOptions[CURLOPT_FOLLOWLOCATION] =true;
// $curlOptions[CURLOPT_MAXREDIRS] = 5;
if (!empty($opts['accept_content'])) {
if (empty($curlOptions[CURLOPT_HTTPHEADER])) {
$curlOptions[CURLOPT_HTTPHEADER] = [];
}
if (!empty($opts['accept_content'])) {
array_push($curlOptions[CURLOPT_HTTPHEADER], 'Accept: ' . $opts['accept_content']);
}
if (!empty($opts['header'])) {
if (empty($curlOptions[CURLOPT_HTTPHEADER])) {
$curlOptions[CURLOPT_HTTPHEADER] = [];
}
$curlOptions[CURLOPT_HTTPHEADER] = array_merge($opts['header'], $curlOptions[CURLOPT_HTTPHEADER]);
}
@ -146,9 +142,6 @@ class HTTPRequest implements IHTTPRequest
if (!empty($opts['headers'])) {
$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]);
}