]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
pakfire: Use upstream proxy for HTTPS, too
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Mar 2018 15:55:18 +0000 (16:55 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Mar 2018 15:55:18 +0000 (16:55 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/pakfire/lib/functions.pl

index 6cc1771285c8696b9d504ffc7a1c02a7d2e36b7d..78761aef62655a4b3d9502bd30c8050115a6765f 100644 (file)
@@ -166,10 +166,10 @@ sub fetchfile {
                if ($proxysettings{'UPSTREAM_PROXY'}) {
                        logger("DOWNLOAD INFO: Upstream proxy: \"$proxysettings{'UPSTREAM_PROXY'}\"") unless ($bfile =~ /^counter.py\?.*/); 
                        if ($proxysettings{'UPSTREAM_USER'}) {
-                               $ua->proxy("http","http://$proxysettings{'UPSTREAM_USER'}:$proxysettings{'UPSTREAM_PASSWORD'}@"."$proxysettings{'UPSTREAM_PROXY'}/");
+                               $ua->proxy([["http", "https"] => "http://$proxysettings{'UPSTREAM_USER'}:$proxysettings{'UPSTREAM_PASSWORD'}@"."$proxysettings{'UPSTREAM_PROXY'}/"]);
                                logger("DOWNLOAD INFO: Logging in with: \"$proxysettings{'UPSTREAM_USER'}\" - \"$proxysettings{'UPSTREAM_PASSWORD'}\"") unless ($bfile =~ /^counter.py\?.*/);
                        } else {
-                               $ua->proxy("http","http://$proxysettings{'UPSTREAM_PROXY'}/");
+                               $ua->proxy([["http", "https"] => "http://$proxysettings{'UPSTREAM_PROXY'}/"]);
                        }
                }