blacklistLoader can now use wget or curl, if curl is available

git-svn-id: http://svn.tabris.net/repos/srsv@3523 70d4eda1-72e9-0310-a436-91e5bd24443c

diff --git a/branches/0.4.3/utils/blacklistLoader.pl b/branches/0.4.3/utils/blacklistLoader.pl
index 04e3105cf61ffd51123b845a1a4706d83d79fe53..314c2b44bf8e801abdbe2c4a77e1136d54c29284 100755 (executable)
--- a/branches/0.4.3/utils/blacklistLoader.pl
+++ b/branches/0.4.3/utils/blacklistLoader.pl
@@ -49,9 +49,24 @@ my $srcname = 'http://dronebl.org/buildzone.do';
 my $bindip = undef;
 my $unpackname = $srcname;
 my $diffname = $srcname.'.diff';
+my $agent = findAgent();
+
+sub findAgent {
+       my $agent;
+       my $ret = system('which curl');
+       if(($ret >> 8) == 0) {
+               # we prefer curl b/c it can handle gzip compression!
+               # we do IPv4 b/c either their IPv6 gateway or ours is SLOW
+               # UPDATE 2011/05: due to DDoS, IPv4 is swamped, IPv6 is only way!
+               $agent = 'curl --compressed --silent';
+       } else {
+               $agent = 'wget -q -O -';
+       }
+       return $agent;
+}
 
 my $OPMDATA;
-unless(open $OPMDATA, '-|', "wget -q -O - $srcname") {
+unless(open $OPMDATA, '-|', "$agent $srcname") {
        print STDERR "FATAL: Processing failed.\n";
        exit -1;
 }