Skip to content

[stable16] Correctly handle emtpy string in proxyuserpwd config #17511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 3 commits into from
Oct 17, 2019
Merged

[stable16] Correctly handle emtpy string in proxyuserpwd config #17511

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fc86e6
Correctly handle emtpy string in proxyuserpwd config
sshambar Aug 2, 2019
0f5cc52
remove odd code, align to master
blizzz Oct 11, 2019
29a1ac7
adjust tests
blizzz Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove odd code, align to master 
Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz
blizzz committed Oct 11, 2019
commit 0f5cc5249c47e8672774c66671842b56a0941547
9 changes: 3 additions & 6 deletions lib/private/Http/Client/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,21 +114,18 @@ private function getCertBundle() {
*/
private function getProxyUri(): ?string {
$proxyHost = $this->config->getSystemValue('proxy', '');

if ($proxyHost === '' || $proxyHost === null) {
return null;
}

$proxyUserPwd = $this->config->getSystemValue('proxyuserpwd', '');
$proxyUri = '';

if ($proxyUserPwd === '' || $proxyUserPwd === null) {
$proxyUri .= $proxyUserPwd . '@';
}
if ($proxyHost !== null) {
$proxyUri .= $proxyHost;
return $proxyHost;
}

return $proxyUri;
return $proxyUserPwd . '@' . $proxyHost;
}

/**
Expand Down