Fix permanent_url for HTTP 301 #660
Merged
Conversation
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
Using cURL CURLOPT_FOLLOWLOCATION instead of the manual method in SimplePie hides the list of HTTP redirects along the way, and prevents the distinction of e.g. 301 vs. 302 redirects needed for `simplepie->subscribe_url(true)`. This patch disables CURLOPT_FOLLOWLOCATION in SimplePie, and fixes the manual method at the same time (curl_options where not given to following redirection requests). The use of CURLOPT_FOLLOWLOCATION was nevertheless not systematic (only when open_basedir was not set), so now there is only one logic independent of open_basedir.
Alkarex
commented
Sep 16, 2020
| curl_setopt($fp, CURLOPT_REFERER, $url); | ||
| curl_setopt($fp, CURLOPT_USERAGENT, $useragent); | ||
| curl_setopt($fp, CURLOPT_HTTPHEADER, $headers2); | ||
| if (!ini_get('open_basedir') && version_compare(SimplePie_Misc::get_curl_version(), '7.15.2', '>=')) |
Contributor
Author
There was a problem hiding this comment.
Those cURL options were only used in some configurations, and were problematic
Alkarex
commented
Sep 16, 2020
| $this->redirects++; | ||
| $location = SimplePie_Misc::absolutize_url($this->headers['location'], $url); | ||
| $previousStatusCode = $this->status_code; | ||
| $this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen); |
Contributor
Author
There was a problem hiding this comment.
For configurations using the manual redirect method, the cURL options were lost.
Contributor
Author
Contributor
Author
|
Original code for HTTP 301 Moved Permanently b3e7227 |
Member
|
thanks @Alkarex looks good to me. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Using cURL CURLOPT_FOLLOWLOCATION instead of the manual method in SimplePie hides the list of HTTP redirects along the way, and prevents the distinction of e.g. 301 vs. 302 redirects needed for
simplepie->subscribe_url(true).This patch disables CURLOPT_FOLLOWLOCATION in SimplePie, and fixes the manual method at the same time (curl_options were not given to following redirection requests).
The use of CURLOPT_FOLLOWLOCATION was nevertheless not systematic (only when open_basedir was not set), so now there is only one logic independent of open_basedir.