From c21e20134660ccb5855bac3f9287d7bd9073ebf9 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 5 Sep 2002 15:14:40 +0000
Subject: allow http://xxx for ftp_proxy

---
 perl-install/network/network.pm | 2 +-
 perl-install/proxy.pm           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 1db101f7b..d1f9da76b 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -390,7 +390,7 @@ sub miscellaneousNetwork {
        ],
        complete => sub {
 	   $u->{http_proxy} =~ m,^($|http://), or $in->ask_warn('', _("Proxy should be http://...")), return 1,0;
-	   $u->{ftp_proxy} =~ m,^($|ftp://), or $in->ask_warn('', _("Proxy should be ftp://...")), return 1,1;
+	   $u->{ftp_proxy} =~ m,^($|ftp://|http://), or $in->ask_warn('', _("Url should begin with 'ftp:' or 'http:'")), return 1,1;
 	   0;
        }
     ) or return);
diff --git a/perl-install/proxy.pm b/perl-install/proxy.pm
index 8a2de8f3c..b01a7b9bf 100644
--- a/perl-install/proxy.pm
+++ b/perl-install/proxy.pm
@@ -16,7 +16,7 @@ sub main {
     # grab current config
     foreach (cat_($config_file)) {
       /http_proxy = (http:.*):(\d+)/ and ($proxy_cfg->{http_url}, $proxy_cfg->{http_port}) = ($1, $2);
-      /ftp_proxy = (ftp:.*):(\d+)/ and ($proxy_cfg->{ftp_url}, $proxy_cfg->{ftp_port}) = ($1, $2);
+      /ftp_proxy = ((?:ftp|http):.*):(\d+)/ and ($proxy_cfg->{ftp_url}, $proxy_cfg->{ftp_port}) = ($1, $2);
       /http_user = (.*)/ and ($proxy_cfg->{login}) = $1;
       if (/http_passwd = (.*)/) {
         ($proxy_cfg->{passwd}) = $1;
-- 
cgit v1.2.1