From fd1d85365cb1368fa70263fe3ae3b8e59ab56615 Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Sun, 24 Feb 2019 19:24:13 +0100
Subject: [PATCH] Refactor getProxyUri
Get proxyuserpwd only if proxy not empty.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---
lib/private/Http/Client/Client.php | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/lib/private/Http/Client/Client.php b/lib/private/Http/Client/Client.php
index baa358f2fea..ad51feca0be 100644
--- a/lib/private/Http/Client/Client.php
+++ b/lib/private/Http/Client/Client.php
@@ -96,21 +96,18 @@ class Client implements IClient {
*/
private function getProxyUri(): ?string {
$proxyHost = $this->config->getSystemValue('proxy', null);
- $proxyUserPwd = $this->config->getSystemValue('proxyuserpwd', null);
- if ($proxyHost === null && $proxyUserPwd === null) {
+ if ($proxyHost === null) {
return null;
}
- $proxyUri = '';
- if ($proxyUserPwd !== null) {
- $proxyUri .= $proxyUserPwd . '@';
- }
- if ($proxyHost !== null) {
- $proxyUri .= $proxyHost;
+ $proxyUserPwd = $this->config->getSystemValue('proxyuserpwd', null);
+
+ if ($proxyUserPwd === null) {
+ return $proxyHost;
}
- return $proxyUri;
+ return $proxyUserPwd . '@' . $proxyHost;
}
/**
--
GitLab