diff options
| -rw-r--r-- | urpm.pm | 6 | ||||
| -rw-r--r-- | urpmi.spec | 5 |
2 files changed, 8 insertions, 3 deletions
@@ -208,9 +208,10 @@ sub sync_curl { local *CURL; my $options = shift @_; chdir(ref($options) ? $options->{dir} : $options); - my (@ftp_files, @other_files); + my (@ftp_files, @other_files, $use_https); 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) { @@ -262,7 +263,8 @@ sub sync_curl { open CURL, join(" ", map { "'$_'" } "/usr/bin/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" : @{[]}), "-R", "-f", "-k", "--stderr", "-", + (ref($options) && $options->{quiet} && !$options->{verbose} ? "-s" : @{[]}), + ($use_https ? "-k" : @{[]}), "-R", "-f", "--stderr", "-", @all_files) . " |"; local $/ = \1; #- read input by only one char, this is slow but very nice (and it works!). while (<CURL>) { @@ -2,7 +2,7 @@ Name: urpmi Version: 4.2 -Release: 32mdk +Release: 33mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate @@ -199,6 +199,9 @@ $urpm->update_media; %changelog +* Thu Mar 13 2003 François Pons <fpons@mandrakesoft.com> 4.2-33mdk +- fix bug 3258 (use curl -k only for https for curl of 9.0). + * Wed Mar 12 2003 François Pons <fpons@mandrakesoft.com> 4.2-32mdk - added https:// protocol. (avoid curl limitation and fix bug 3226). |