LWP::UserAgent - proxy support

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@836 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/src/Net.pl b/src/Net.pl
index 306e20a5542aac82da107557cf537bf1575b1f33..1d167cc04235ee661c6d24673cde934252b256c5 100644 (file)
--- a/src/Net.pl
+++ b/src/Net.pl
@@ -182,21 +182,20 @@ sub getURLAsFile {
     my ($url,$file) = @_;
     my ($ua,$res,$req);
 
-    return unless &loadPerlModule("LWP::Simple");
-
-### PROXY NOT SUPPORTED WITH SIMPLE?
-###    $ua->proxy('http', $param{'httpProxy'}) if &IsParam("httpProxy");
-    my $time   = time();
+    return unless &loadPerlModule("LWP::UserAgent");
+    $ua = new LWP::UserAgent;
+    $ua->proxy('http', $param{'httpProxy'}) if &IsParam("httpProxy");
+    my $req = HTTP::Request->new('GET', $url);
+    my $time = time();
     &status("getURLAsFile: getting '$url' as '$file'");
-    my $retval = getstore($url, $file);
+    my $res = $ua->request($req, $file);
     my $delta_time     = time() - $time;
     if ($delta_time) {
        my $size = -s $file || 0;
        my $rate = int($size / $delta_time / 1024);
        &status("getURLAsFile: Done. ($rate kB/sec)");
     }
-
-    return $retval;
+    return $res;
 }
 
 1;