Skip to content

Sync upstream#34

Merged
Alkarex merged 3 commits intofreshrssfrom
merge-upstream
Mar 15, 2025
Merged

Sync upstream#34
Alkarex merged 3 commits intofreshrssfrom
merge-upstream

Conversation

@Alkarex
Copy link
Member

@Alkarex Alkarex commented Mar 15, 2025

No description provided.

Alkarex and others added 3 commits March 15, 2025 10:37
Previously, if a library user passed `CURLOPT_HTTPHEADER` option through `SimplePie::set_curl_options()`, it would discard all headers passed by SimplePie through the `$headers` parameter. Some of those are essential so discarding them is a bad idea.

Let’s append the externally provided HTTP headers to the list to be passed to `CURLOPT_HTTPHEADER` instead.

There is no simple way to remove the SimplePie-generated headers now but, since it only sets `Accept`, `if-modified-since`, `if-none-match` and `X-FORWARDED-FOR`, it is probably not a big deal. Especially when `FileClient` is about to be deprecated.
Those files should not end up in release packages.

Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
@Alkarex Alkarex merged commit d31582a into freshrss Mar 15, 2025
20 checks passed
@Alkarex Alkarex deleted the merge-upstream branch March 15, 2025 10:37
Alkarex added a commit to Alkarex/FreshRSS that referenced this pull request Mar 15, 2025
Alkarex added a commit to FreshRSS/FreshRSS that referenced this pull request Mar 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants