[stable16] Correctly handle emtpy string in proxyuserpwd config #17511
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
As documented, the default value for config value proxyuserpwd is ''. However, that value results in the error: "cURL error 5: Unsupported proxy syntax in '@'". This patch handles the values of '' and null (the default in the code) the same for config values proxyuserpwd and proxy. Signed-off-by: Scott Shambarger <devel@shambarger.net>
blizzz
requested review from
ChristophWurst,
juliusknorr,
kesselb,
nickvergessen and
rullzer
kesselb
requested changes
Oct 11, 2019
lib/private/Http/Client/Client.php
Outdated
| if ($proxyUserPwd === '' || $proxyUserPwd === null) { | ||
| $proxyUri .= $proxyUserPwd . '@'; | ||
| } | ||
| if ($proxyHost !== null) { |
lib/private/Http/Client/Client.php
Outdated
|
|
||
| if ($proxyUserPwd !== null) { | ||
| if ($proxyUserPwd === '' || $proxyUserPwd === null) { | ||
| $proxyUri .= $proxyUserPwd . '@'; |
There was a problem hiding this comment.
Suggested change
| $proxyUri .= $proxyUserPwd . '@'; | |
| return $proxyHost; |
There was a problem hiding this comment.
lets keep the backport as identical as we can to the original. Then we can do what you suggest in a PR against master ;)
There was a problem hiding this comment.
#14363 is not totally needed, to fix the issue that proxy is set to '@' when the documented default values are used in config.php instead of null.
kesselb
reviewed
Oct 11, 2019
lib/private/Http/Client/Client.php
Outdated
| } | ||
|
|
||
| $proxyUserPwd = $this->config->getSystemValue('proxyuserpwd', ''); | ||
| $proxyUri = ''; |
|
Hmm. Tricky to backport because fd1d853 is not backported. |
|
@kesselb good catch. De-facto it the other commit is picked up half-way through merge conflict resolution, but some pieces are too much indeed. I ironed it out. |
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
blizzz
force-pushed
the
backport/16721/stable16
branch
from
6067e2e to
0f5cc52
Compare
kesselb
approved these changes
Oct 11, 2019
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Merged
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.
backport of #16721