Use CURLOPT_ACCEPT_ENCODING instead of CURLOPT_ENCODING when avialable#960
Merged
jtojnar merged 1 commit intosimplepie:masterfrom Jan 15, 2026
Conversation
Alkarex
reviewed
Jan 1, 2026
4 tasks
47c4169 to
2f42dec
Compare
Alkarex
reviewed
Jan 3, 2026
Alkarex
reviewed
Jan 3, 2026
The CURLOPT_ENCODING option is obsolete since cURL 7.21.6, in favor of CURLOPT_ACCEPT_ENCODING. I've put the updated option name behind a cURL version check, as SimplePie supports older PHP versions which in turn support older cURL versions which don't have the updated option name yet. See: https://curl.se/libcurl/c/CURLOPT_ACCEPT_ENCODING.html
2f42dec to
6fe31d5
Compare
Alkarex
added a commit
to FreshRSS/simplepie
that referenced
this pull request
Jan 3, 2026
Merge upstream @mmeier86 * simplepie#960 * simplepie#962
Alkarex
added a commit
to FreshRSS/FreshRSS
that referenced
this pull request
Jan 3, 2026
…LOPT_ENCODING (#8376) * Replace deprecated CURLOPT_ENCODING The CURLOPT_ENCODING setting has been deprecated in favor of CURLOPT_ACCEPT_ENCODING. Signed-off-by: Michael Meier <mmeier1986@gmail.com> * Sync with our SimplePie fork PR FreshRSS/simplepie#67 simplepie/simplepie#960 simplepie/simplepie#962 * Our SimplePie PR merged --------- Signed-off-by: Michael Meier <mmeier1986@gmail.com> Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Member
|
Turns out we do not need the second condition: #965 |
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
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.
This PR fixes #959.
It replaces the
CURLOPT_ENCODINGsetting withCURLOPT_ACCEPT_ENCODING, but only when a cURL version newer than 7.21.6 is available.See note on renaming in the CURLOPT_ACCEPT_ENCODING man page.