diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-08-11 22:46:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-11 22:46:01 +0200 |
| commit | f465f9d4b9753687f59c09c6ce73c45fb5f79339 (patch) | |
| tree | dbd29e6106d0b31cb6f90bda50862ec44ff9f32c /lib | |
| parent | 9d6eb2daf7c0f9d50aca78db02dbe8418a642768 (diff) | |
| parent | edf946dfc7c8ddc5f4ad125d2a0c780bbc63e769 (diff) | |
| download | nextcloud-server-f465f9d4b9753687f59c09c6ce73c45fb5f79339.tar.gz nextcloud-server-f465f9d4b9753687f59c09c6ce73c45fb5f79339.zip | |
Merge pull request #16721 from nextcloud/fix/16644
Correctly handle emtpy string in proxyuserpwd config
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Http/Client/Client.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/Http/Client/Client.php b/lib/private/Http/Client/Client.php index ad51feca0be..993b83917fd 100644 --- a/lib/private/Http/Client/Client.php +++ b/lib/private/Http/Client/Client.php @@ -95,15 +95,15 @@ class Client implements IClient { * @return string|null */ private function getProxyUri(): ?string { - $proxyHost = $this->config->getSystemValue('proxy', null); + $proxyHost = $this->config->getSystemValue('proxy', ''); - if ($proxyHost === null) { + if ($proxyHost === '' || $proxyHost === null) { return null; } - $proxyUserPwd = $this->config->getSystemValue('proxyuserpwd', null); + $proxyUserPwd = $this->config->getSystemValue('proxyuserpwd', ''); - if ($proxyUserPwd === null) { + if ($proxyUserPwd === '' || $proxyUserPwd === null) { return $proxyHost; } |