Fix merge HTTP headers with cURL options#956
Closed
Alkarex wants to merge 3 commits intosimplepie:masterfrom
Closed
Fix merge HTTP headers with cURL options#956Alkarex wants to merge 3 commits intosimplepie:masterfrom
Alkarex wants to merge 3 commits intosimplepie:masterfrom
Conversation
HTTP headers were not merged properly, and were also not accounting for possible casing differences. Follow-up of simplepie#912 It was for instance not possible to override the `Accept` header from the cURL options. The existing code could not work properly because we were merging arrays of strings and not arrays of key-values, leading to strange duplicates. Downstream: FreshRSS/FreshRSS#8246
Alkarex
commented
Nov 25, 2025
| if (!$force_fsockopen && function_exists('curl_exec')) { | ||
| $this->method = \SimplePie\SimplePie::FILE_SOURCE_REMOTE | \SimplePie\SimplePie::FILE_SOURCE_CURL; | ||
| $fp = curl_init(); | ||
| $headers2 = []; |
Contributor
Author
There was a problem hiding this comment.
Renamed as $headers_inlined below
Alkarex
commented
Nov 25, 2025
| } | ||
| if (isset($curl_options[CURLOPT_HTTPHEADER])) { | ||
| if (is_array($curl_options[CURLOPT_HTTPHEADER])) { | ||
| $headers2 = array_merge($headers2, $curl_options[CURLOPT_HTTPHEADER]); |
Contributor
Author
There was a problem hiding this comment.
Could not work because those are arrays of strings and not arrays of key-values.
Alkarex
added a commit
to Alkarex/simplepie
that referenced
this pull request
Nov 25, 2025
HTTP headers were not merged properly, and were also not accounting for possible casing differences. Follow-up of simplepie#912 It was for instance not possible to override the `Accept` header from the cURL options. The existing code could not work properly because we were merging arrays of strings and not arrays of key-values, leading to strange duplicates. Downstream: FreshRSS/FreshRSS#8246 Upstream: simplepie#956
Alkarex
added a commit
to FreshRSS/simplepie
that referenced
this pull request
Nov 25, 2025
HTTP headers were not merged properly, and were also not accounting for possible casing differences. Follow-up of simplepie#912 It was for instance not possible to override the `Accept` header from the cURL options. The existing code could not work properly because we were merging arrays of strings and not arrays of key-values, leading to strange duplicates. Downstream: * FreshRSS/FreshRSS#8246 Upstream: * simplepie#956
Contributor
Author
|
I need to rethink that. There are valid reasons for multiple identical HTTP headers such as: |
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.
HTTP headers were not merged properly, and were also not accounting for possible casing differences.
Follow-up of #912
It was for instance not possible to override the
Acceptheader from the cURL options.The existing code could not work properly because we were merging arrays of strings and not arrays of key-values, leading to strange duplicates.
Downstream: FreshRSS/FreshRSS#8246