From 74599bd2ab6f0f3456812e20a4a07867af21c31e Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Thu, 27 Mar 2003 15:23:34 +0000 Subject: fix MandrakeClub downloads problem: take advantage of --location-trusted when available (available in curl >= 7.10.3-2mdk) --- urpm.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'urpm.pm') diff --git a/urpm.pm b/urpm.pm index f9198635..5b0eedd0 100644 --- a/urpm.pm +++ b/urpm.pm @@ -208,10 +208,9 @@ sub sync_curl { local *CURL; my $options = shift @_; chdir(ref($options) ? $options->{dir} : $options); - my (@ftp_files, @other_files, $use_https); + my (@ftp_files, @other_files); foreach (@_) { /^ftp:\/\/.*\/([^\/]*)$/ && -s $1 > 8192 and do { push @ftp_files, $_; next }; #- manage time stamp for large file only. - $use_https ||= /^https:/; push @other_files, $_; } if (@ftp_files) { @@ -264,7 +263,8 @@ sub sync_curl { (ref($options) && $options->{limit_rate} ? ("--limit-rate", $options->{limit_rate}) : ()), (ref($options) && $options->{proxy} ? set_proxy({ type => "curl", proxy => $options->{proxy} }) : ()), (ref($options) && $options->{quiet} && !$options->{verbose} ? "-s" : @{[]}), - ($use_https ? "-k" : @{[]}), "-R", "-f", "--stderr", "-", + "-k", `curl -h` =~ /location-trusted/ ? "--location-trusted" : @{[]}, + "-R", "-f", "--stderr", "-", @all_files) . " |"; local $/ = \1; #- read input by only one char, this is slow but very nice (and it works!). while () { -- cgit v1.2.1