From: Michael G Schwern <schwern@pobox.com>
Date: Mon, 11 Jul 2005 23:19:06 +0000 (-0700)
Subject: [perl #17487] ncftp only handles http
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=58df5ac7fb4236f284c61d77d9e06ac3d5c83178;p=p5sagit%2Fp5-mst-13.2.git

[perl #17487] ncftp only handles http
From: "Michael G Schwern via RT" <perlbug-followup@perl.org>
Message-ID: <rt-3.0.11-17487-116934.11.3382445877892@perl.org>

(and bump $VERSION (1.76_01 is a CPAN release already))

p4raw-id: //depot/perl@25124
---

diff --git a/lib/CPAN.pm b/lib/CPAN.pm
index 887d5cd..fd184b2 100644
--- a/lib/CPAN.pm
+++ b/lib/CPAN.pm
@@ -1,6 +1,6 @@
 # -*- Mode: cperl; coding: utf-8; cperl-indent-level: 4 -*-
 package CPAN;
-$VERSION = '1.76_01';
+$VERSION = '1.76_02';
 $VERSION = eval $VERSION;
 # $Id: CPAN.pm,v 1.412 2003/07/31 14:53:04 k Exp $
 
@@ -2605,7 +2605,10 @@ sub hosthard {
 
 	$self->debug("localizing funkyftpwise[$url]") if $CPAN::DEBUG;
 	my($f,$funkyftp);
-	for $f ('lynx','ncftpget','ncftp','wget') {
+
+        # Try the most capable first (wget does HTTP, HTTPS and FTP) and
+        # leave ncftp* for last as it only does FTP.
+	for $f (qw(wget lynx ncftpget ncftp)) {
 	  next unless exists $CPAN::Config->{$f};
 	  $funkyftp = $CPAN::Config->{$f};
 	  next unless defined $funkyftp;
@@ -2696,7 +2699,7 @@ returned status $estatus (wstat $wstatus)$size
 });
 	  }
           return if $CPAN::Signal;
-	} # lynx,ncftpget,ncftp
+	} # wget,lynx,ncftpget,ncftp
     } # host
 }