This patch ensures Pakfire will download updates via the configured upstream proxy (if any) for both HTTP and HTTPS.
Fixes: #12357
Signed-off-by: Peter Müller peter.mueller@ipfire.org --- src/pakfire/lib/functions.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 45e3427b1..17a420c33 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -161,10 +161,10 @@ sub fetchfile { if ($proxysettings{'UPSTREAM_PROXY'}) { logger("DOWNLOAD INFO: Upstream proxy: "$proxysettings{'UPSTREAM_PROXY'}""); if ($proxysettings{'UPSTREAM_USER'}) { - $ua->proxy([["http", "https"] => "http://$proxysettings%7B%27UPSTREAM_USER%27%7D:$proxysettings%7B%27UPSTREAM_..."]); + $ua->proxy(["http", "https"], "http://$proxysettings%7B%27UPSTREAM_USER%27%7D:$proxysettings%7B%27UPSTREAM_..."); logger("DOWNLOAD INFO: Logging in with: "$proxysettings{'UPSTREAM_USER'}" - "$proxysettings{'UPSTREAM_PASSWORD'}""); } else { - $ua->proxy([["http", "https"] => "http://$proxysettings%7B%27UPSTREAM_PROXY%27%7D/"]); + $ua->proxy(["http", "https"], "http://$proxysettings%7B%27UPSTREAM_PROXY%27%7D/"); } }
Signed-off-by: Peter Müller peter.mueller@ipfire.org --- src/pakfire/lib/functions.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 17a420c33..4d5c6219a 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -162,7 +162,7 @@ sub fetchfile { logger("DOWNLOAD INFO: Upstream proxy: "$proxysettings{'UPSTREAM_PROXY'}""); if ($proxysettings{'UPSTREAM_USER'}) { $ua->proxy(["http", "https"], "http://$proxysettings%7B%27UPSTREAM_USER%27%7D:$proxysettings%7B%27UPSTREAM_..."); - logger("DOWNLOAD INFO: Logging in with: "$proxysettings{'UPSTREAM_USER'}" - "$proxysettings{'UPSTREAM_PASSWORD'}""); + logger("DOWNLOAD INFO: Logging in with "$proxysettings{'UPSTREAM_USER'}" against "$proxysettings{'UPSTREAM_PROXY'}""); } else { $ua->proxy(["http", "https"], "http://$proxysettings%7B%27UPSTREAM_PROXY%27%7D/"); }
Reviewed-by: Michael Tremer michael.tremer@ipfire.org
On 11 Apr 2020, at 11:20, Peter Müller peter.mueller@ipfire.org wrote:
Signed-off-by: Peter Müller peter.mueller@ipfire.org
src/pakfire/lib/functions.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 17a420c33..4d5c6219a 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -162,7 +162,7 @@ sub fetchfile { logger("DOWNLOAD INFO: Upstream proxy: "$proxysettings{'UPSTREAM_PROXY'}""); if ($proxysettings{'UPSTREAM_USER'}) { $ua->proxy(["http", "https"], "http://$proxysettings%7B%27UPSTREAM_USER%27%7D:$proxysettings%7B%27UPSTREAM_...");
logger("DOWNLOAD INFO: Logging in with: \"$proxysettings{'UPSTREAM_USER'}\" - \"$proxysettings{'UPSTREAM_PASSWORD'}\"");
logger("DOWNLOAD INFO: Logging in with \"$proxysettings{'UPSTREAM_USER'}\" against \"$proxysettings{'UPSTREAM_PROXY'}\""); } else { $ua->proxy(["http", "https"], "http://$proxysettings{'UPSTREAM_PROXY'}/"); }
-- 2.16.4