From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: development@lists.ipfire.org Subject: [PATCH 2/2] fix download routines in Pakfire if behind upstream proxy Date: Mon, 22 Oct 2018 19:58:13 +0200 Message-ID: <20181022175813.3938-2-peter.mueller@link38.eu> In-Reply-To: <20181022175813.3938-1-peter.mueller@link38.eu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6013092706603092909==" List-Id: --===============6013092706603092909== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Using an array for setting both HTTP and HTTPS proxy settings in functions.pl does not seem to work, the queries are still transferred directly. Setting proxies with two code lines is boilerplate-style, but works much more robust. Partially fixes #11900 Signed-off-by: Peter M=C3=BCller --- src/pakfire/lib/functions.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index bbc580ad2..291a111b9 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -157,10 +157,12 @@ sub fetchfile { if ($proxysettings{'UPSTREAM_PROXY'}) { logger("DOWNLOAD INFO: Upstream proxy: \"$proxysettings{'UPSTREAM_PROXY'}= \""); if ($proxysettings{'UPSTREAM_USER'}) { - $ua->proxy([["http", "https"] =3D> "http://$proxysettings{'UPSTREAM_USER= '}:$proxysettings{'UPSTREAM_PASSWORD'}@"."$proxysettings{'UPSTREAM_PROXY'}/"]= ); + $ua->proxy("http" =3D> "http://$proxysettings{'UPSTREAM_USER'}:$proxyset= tings{'UPSTREAM_PASSWORD'}\@$proxysettings{'UPSTREAM_PROXY'}/"); + $ua->proxy("https" =3D> "http://$proxysettings{'UPSTREAM_USER'}:$proxyse= ttings{'UPSTREAM_PASSWORD'}\@$proxysettings{'UPSTREAM_PROXY'}/"); logger("DOWNLOAD INFO: Logging in with: \"$proxysettings{'UPSTREAM_USER'= }\" - \"$proxysettings{'UPSTREAM_PASSWORD'}\""); } else { - $ua->proxy([["http", "https"] =3D> "http://$proxysettings{'UPSTREAM_PROX= Y'}/"]); + $ua->proxy("http" =3D> "http://$proxysettings{'UPSTREAM_PROXY'}/"); + $ua->proxy("https" =3D> "http://$proxysettings{'UPSTREAM_PROXY'}/"); } } =20 --=20 2.16.4 --===============6013092706603092909==--