Refactor some cURL options and use CURLOPT_USERPWD #6177
Merged
Conversation
This file contains 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
Alkarex
commented
Mar 6, 2024
Alkarex
commented
Mar 6, 2024
| public function curlOptions(): array { | ||
| $curl_options = []; | ||
| if ($this->httpAuth !== '') { | ||
| $curl_options[CURLOPT_USERPWD] = htmlspecialchars_decode($this->httpAuth, ENT_QUOTES); |
There was a problem hiding this comment.
The main change is here :-)
Alkarex
commented
Mar 6, 2024
| $url = htmlspecialchars_decode($this->url, ENT_QUOTES); | ||
| if ($this->httpAuth != '') { | ||
| $url = preg_replace('#((.+)://)(.+)#', '${1}' . $this->httpAuth . '@${3}', $url) ?? ''; |
There was a problem hiding this comment.
This is how we did before
Alkarex
added a commit
to Alkarex/FreshRSS
that referenced
this pull request
May 25, 2024
fix FreshRSS#6491 Regression from FreshRSS#6177
Alkarex
added a commit
that referenced
this pull request
May 25, 2024
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.
fix #6176
P.S. It started as a little fix and turned into a slightly larger refactoring to address all related cases.