diff options
| author | Alexandre Alapetite <alexandre@alapetite.fr> | 2025-03-05 16:45:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-05 16:45:06 +0100 |
| commit | ecdb63c33582963be055472a056c8e3e445fb5bf (patch) | |
| tree | ada18f124616f7e28cca58b421f0749d3a1a8c41 /app | |
| parent | 9641f2a5a39d6022f1ac272c858b37fad39db84d (diff) | |
| download | freshrss-ecdb63c33582963be055472a056c8e3e445fb5bf.tar.gz freshrss-ecdb63c33582963be055472a056c8e3e445fb5bf.zip | |
Fix regression cURL HTTP headers (#7403)
* 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
Diffstat (limited to 'app')
| -rwxr-xr-x | app/Controllers/feedController.php | 3 | ||||
| -rw-r--r-- | app/Controllers/subscriptionController.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index 3ceb00f4a..e64607277 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -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] ?? []); } diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php index 800f6b7c9..08103bcbf 100644 --- a/app/Controllers/subscriptionController.php +++ b/app/Controllers/subscriptionController.php @@ -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] ?? []); } |