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 /lib/simplepie | |
| parent | 9641f2a5a39d6022f1ac272c858b37fad39db84d (diff) | |
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 'lib/simplepie')
| -rw-r--r-- | lib/simplepie/simplepie/src/File.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/simplepie/simplepie/src/File.php b/lib/simplepie/simplepie/src/File.php index 9099c8492..6f5f37c3c 100644 --- a/lib/simplepie/simplepie/src/File.php +++ b/lib/simplepie/simplepie/src/File.php @@ -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, ''); } |