mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-15 02:33:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression cURL HTTP headers (#7403)

Browse Source 
* Fix regression cURL HTTP headers
fix https://github.com/FreshRSS/FreshRSS/issues/6712#issuecomment-2697961491
We would sometimes wrongly override the default HTTP headers of SimplePie
https://github.com/FreshRSS/simplepie/pull/33
https://github.com/simplepie/simplepie/pull/912

* Sync SimplePie
https://github.com/FreshRSS/simplepie/pull/33
This commit is contained in:
Alexandre Alapetite
2025-03-05 16:45:06 +01:00
committed by GitHub
parent 9641f2a5a3
commit ecdb63c335
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controllers/feedController.php
View File

@@ -211,8 +211,9 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
}
}
}
$headers = array_filter(array_map('trim', $headers));
if (!empty($headers)) {
$headers = array_filter(array_map('trim', $headers));
$opts[CURLOPT_HTTPHEADER] = array_merge($headers, $opts[CURLOPT_HTTPHEADER] ?? []);
}

2
app/Controllers/subscriptionController.php
View File

@@ -194,8 +194,8 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController {
}
}
$headers = array_filter(array_map('trim', $headers));
if (!empty($headers)) {
$headers = array_filter(array_map('trim', $headers));
$opts[CURLOPT_HTTPHEADER] = array_merge($headers, $opts[CURLOPT_HTTPHEADER] ?? []);
}

2
lib/composer.json
View File

@@ -14,7 +14,7 @@
"marienfressinaud/lib_opml": "0.5.1",
"phpgt/cssxpath": "v1.3.0",
"phpmailer/phpmailer": "6.9.3",
"simplepie/simplepie": "dev-freshrss#dd86e5e9efb8d082ebd214b81cc5aa746f02fc26"
"simplepie/simplepie": "dev-freshrss#d7e513f3366b8f26fd32643544f839d0a789abe8"
},
"config": {
"sort-packages": true,

6
lib/simplepie/simplepie/src/File.php
View File

@@ -115,6 +115,12 @@ class File implements Response
foreach ($headers as $key => $value) {
$headers2[] = "$key: $value";
}
if (isset($curl_options[CURLOPT_HTTPHEADER])) {
if (is_array($curl_options[CURLOPT_HTTPHEADER])) {
$headers2 = array_merge($headers2, $curl_options[CURLOPT_HTTPHEADER]);
}
unset($curl_options[CURLOPT_HTTPHEADER]);
}
if (version_compare(\SimplePie\Misc::get_curl_version(), '7.10.5', '>=')) {
curl_setopt($fp, CURLOPT_ENCODING, '');
}