|
|
@@ -227,24 +227,17 @@ sub fetch_url {
|
|
|
}
|
|
|
|
|
|
# try to fetch the URL
|
|
|
- unlink("$dst.err");
|
|
|
unlink("$dst.hdr");
|
|
|
- $rc = system($CFG->{PRG}->{"curl"}.
|
|
|
+ $rc = system($CFG->{PRG}->{"curl"} .
|
|
|
" --location" .
|
|
|
" --max-time 1800" .
|
|
|
" --connect-timeout 20" .
|
|
|
" --dump-header $dst.hdr" .
|
|
|
- " --output '$dst' '$src' 2>&1 | tee $dst.err");
|
|
|
- # " --stderr $dst.err" .
|
|
|
+ " --output '$dst' '$src'");
|
|
|
|
|
|
# check whether command failed
|
|
|
if ($rc != 0) {
|
|
|
- unlink($dst);
|
|
|
- open(FP, "<$dst.err");
|
|
|
- my $err = <FP>;
|
|
|
- close(FP);
|
|
|
- $err =~ s|\n$||;
|
|
|
- return $err;
|
|
|
+ return "cURL error";
|
|
|
}
|
|
|
|
|
|
# check whether remote sites failed
|
|
|
@@ -262,7 +255,6 @@ sub fetch_url {
|
|
|
}
|
|
|
|
|
|
# cleanup
|
|
|
- unlink("$dst.err");
|
|
|
unlink("$dst.hdr");
|
|
|
|
|
|
return '';
|
