Merged
Conversation
The `$curl_options` parameter could override the `CURLOPT_HTTPHEADER` option, so make sure to merge the HTTP headers properly
Member
Author
|
Upstream PR simplepie#912 |
Alkarex
added a commit
to Alkarex/FreshRSS
that referenced
this pull request
Mar 5, 2025
fix FreshRSS#6712 (comment) We would sometimes wrongly override the default HTTP headers of SimplePie FreshRSS/simplepie#33 simplepie/simplepie#912
Alkarex
added a commit
to Alkarex/FreshRSS
that referenced
this pull request
Mar 5, 2025
Alkarex
added a commit
to FreshRSS/FreshRSS
that referenced
this pull request
Mar 5, 2025
* Fix regression cURL HTTP headers fix #6712 (comment) We would sometimes wrongly override the default HTTP headers of SimplePie FreshRSS/simplepie#33 simplepie/simplepie#912 * Sync SimplePie FreshRSS/simplepie#33
Sh4kE
added a commit
to Sh4kE/freshrss-helm-chart
that referenced
this pull request
Mar 15, 2025
This PR contains the following updates: | Package | Update | Change | |---|---|---| | [freshrss/freshrss](https://freshrss.org/) ([source](https://github.com/FreshRSS/FreshRSS)) | patch | `1.26.0-alpine` -> `1.26.1-alpine` | --- ### Release Notes <details> <summary>FreshRSS/FreshRSS (freshrss/freshrss)</summary> ### [`v1.26.1`](https://github.com/FreshRSS/FreshRSS/blob/HEAD/CHANGELOG.md#2025-03-13-FreshRSS-1261) [Compare Source](FreshRSS/FreshRSS@1.26.0...1.26.1) - Features - Add cURL version to page about system information [#​7409](FreshRSS/FreshRSS#7409) - Bug fixing - Fix regression with cURL HTTP headers breaking conditional HTTP requests [#​7403](FreshRSS/FreshRSS#7403), [FreshRSS/simplepie#33](FreshRSS/simplepie#33) - Fix regression with saving states of user queries [#​7400](FreshRSS/FreshRSS#7400) - Fix regression with dynamic OPML [#​7394](FreshRSS/FreshRSS#7394) - Fix update of the user’s last activity on login action [#​7406](FreshRSS/FreshRSS#7406) - Fix setting category option *Maximum number of articles to keep per feed* [#​7416](FreshRSS/FreshRSS#7416) - Fix priority field when processing a new feed from an extension [#​7354](FreshRSS/FreshRSS#7354) - Deployment - Fix regression with 64-bit timestamps on 32-bit platforms [#​7375](FreshRSS/FreshRSS#7375) - Fix back-compatibility with cURL 7.51 (we require cURL 7.52+ for `CURLPROXY_HTTPS`) [#​7409](FreshRSS/FreshRSS#7409) - UI - Use case-insensitive sort for categories [#​7402](FreshRSS/FreshRSS#7402) - Improve dark mode of *Origine* theme [#​7413](FreshRSS/FreshRSS#7413) - Added API password indicator [#​7340](FreshRSS/FreshRSS#7340) - I18n - Fix (es, fa, sk): do not translate XPath code [#​7404](FreshRSS/FreshRSS#7404) - Fix date bug in Finish [#​7423](FreshRSS/FreshRSS#7423) - Add Portuguese from Portugal [#​7329](FreshRSS/FreshRSS#7329) - Improve Hungarian [#​7391](FreshRSS/FreshRSS#7391) - Misc. - Improve PHP code [#​7339](FreshRSS/FreshRSS#7339) - Update dev dependencies [#​7386](FreshRSS/FreshRSS#7386), [#​7387](FreshRSS/FreshRSS#7387), [#​7388](FreshRSS/FreshRSS#7388) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4yMDAuMCIsInVwZGF0ZWRJblZlciI6IjM5LjIwMC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119--> Reviewed-on: https://gitea.sh4ke.rocks/lickler/freshrss/pulls/35 Co-authored-by: Michael Wittig <michael.wittig@posteo.de> Co-committed-by: Michael Wittig <michael.wittig@posteo.de>
Sh4kE
added a commit
to Sh4kE/freshrss-helm-chart
that referenced
this pull request
Mar 15, 2025
This PR contains the following updates: | Package | Update | Change | |---|---|---| | [freshrss](https://github.com/FreshRSS/FreshRSS) | patch | `1.26.0` -> `1.26.1` | --- ### Release Notes <details> <summary>FreshRSS/FreshRSS (freshrss)</summary> ### [`v1.26.1`](https://github.com/FreshRSS/FreshRSS/blob/HEAD/CHANGELOG.md#2025-03-13-FreshRSS-1261) [Compare Source](FreshRSS/FreshRSS@1.26.0...1.26.1) - Features - Add cURL version to page about system information [#​7409](FreshRSS/FreshRSS#7409) - Bug fixing - Fix regression with cURL HTTP headers breaking conditional HTTP requests [#​7403](FreshRSS/FreshRSS#7403), [FreshRSS/simplepie#33](FreshRSS/simplepie#33) - Fix regression with saving states of user queries [#​7400](FreshRSS/FreshRSS#7400) - Fix regression with dynamic OPML [#​7394](FreshRSS/FreshRSS#7394) - Fix update of the user’s last activity on login action [#​7406](FreshRSS/FreshRSS#7406) - Fix setting category option *Maximum number of articles to keep per feed* [#​7416](FreshRSS/FreshRSS#7416) - Fix priority field when processing a new feed from an extension [#​7354](FreshRSS/FreshRSS#7354) - Deployment - Fix regression with 64-bit timestamps on 32-bit platforms [#​7375](FreshRSS/FreshRSS#7375) - Fix back-compatibility with cURL 7.51 (we require cURL 7.52+ for `CURLPROXY_HTTPS`) [#​7409](FreshRSS/FreshRSS#7409) - UI - Use case-insensitive sort for categories [#​7402](FreshRSS/FreshRSS#7402) - Improve dark mode of *Origine* theme [#​7413](FreshRSS/FreshRSS#7413) - Added API password indicator [#​7340](FreshRSS/FreshRSS#7340) - I18n - Fix (es, fa, sk): do not translate XPath code [#​7404](FreshRSS/FreshRSS#7404) - Fix date bug in Finish [#​7423](FreshRSS/FreshRSS#7423) - Add Portuguese from Portugal [#​7329](FreshRSS/FreshRSS#7329) - Improve Hungarian [#​7391](FreshRSS/FreshRSS#7391) - Misc. - Improve PHP code [#​7339](FreshRSS/FreshRSS#7339) - Update dev dependencies [#​7386](FreshRSS/FreshRSS#7386), [#​7387](FreshRSS/FreshRSS#7387), [#​7388](FreshRSS/FreshRSS#7388) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4yMDAuMCIsInVwZGF0ZWRJblZlciI6IjM5LjIwMC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119--> Reviewed-on: https://gitea.sh4ke.rocks/lickler/freshrss/pulls/37 Co-authored-by: Michael Wittig <michael.wittig@posteo.de> Co-committed-by: Michael Wittig <michael.wittig@posteo.de>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
$curl_optionsparameter could override theCURLOPT_HTTPHEADERoption, so make sure to merge the HTTP headers properly.Before this patch, providing an additional HTTP header via
$curl_options[CURLOPT_HTTPHEADER]would remove all essential headers such as Accept, if-modified-since, etc.