You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2019/08/05 08:28:40 UTC
svn commit: r1864418 - in /spamassassin: branches/3.4/sa-update.raw
trunk/sa-update.raw
Author: hege
Date: Mon Aug 5 08:28:40 2019
New Revision: 1864418
URL: http://svn.apache.org/viewvc?rev=1864418&view=rev
Log:
Set User-Agent for wget/curl/fetch
Modified:
spamassassin/branches/3.4/sa-update.raw
spamassassin/trunk/sa-update.raw
Modified: spamassassin/branches/3.4/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/sa-update.raw?rev=1864418&r1=1864417&r2=1864418&view=diff
==============================================================================
--- spamassassin/branches/3.4/sa-update.raw (original)
+++ spamassassin/branches/3.4/sa-update.raw Mon Aug 5 08:28:40 2019
@@ -1581,14 +1581,17 @@ sub http_get {
--connect-timeout 30 --max-time 300
--fail -o), $out_fname_short);
push(@args, '-z', $out_fname_short) if $out_fname_exists && !$force_reload;
+ push(@args, '-A', "sa-update/$VERSION/$SAVersion");
} elsif (defined $ext_prog && $ext_prog eq 'wget') {
push(@args, qw(-q --max-redirect=2 --tries=3
--dns-timeout=20 --connect-timeout=30 --read-timeout=300));
push(@args, defined $suggested_out_fname ? ('-O', $out_fname_short)
: $force_reload ? () : ('-N') );
+ push(@args, '-U', "sa-update/$VERSION/$SAVersion");
} elsif (defined $ext_prog && $ext_prog eq 'fetch') {
push(@args, qw(-q -n -a -w 20 -m -o), $out_fname_short);
push(@args, '-m') if $out_fname_exists && !$force_reload;
+ push(@args, "--user-agent=sa-update/$VERSION/$SAVersion");
} elsif ($have_lwp) {
dbg("http: no external tool for download, fallback to using LWP") if !$opt{'httputil'};
my $ims;
Modified: spamassassin/trunk/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-update.raw?rev=1864418&r1=1864417&r2=1864418&view=diff
==============================================================================
--- spamassassin/trunk/sa-update.raw (original)
+++ spamassassin/trunk/sa-update.raw Mon Aug 5 08:28:40 2019
@@ -1581,14 +1581,17 @@ sub http_get {
--connect-timeout 30 --max-time 300
--fail -o), $out_fname_short);
push(@args, '-z', $out_fname_short) if $out_fname_exists && !$force_reload;
+ push(@args, '-A', "sa-update/$VERSION/$SAVersion");
} elsif (defined $ext_prog && $ext_prog eq 'wget') {
push(@args, qw(-q --max-redirect=2 --tries=3
--dns-timeout=20 --connect-timeout=30 --read-timeout=300));
push(@args, defined $suggested_out_fname ? ('-O', $out_fname_short)
: $force_reload ? () : ('-N') );
+ push(@args, '-U', "sa-update/$VERSION/$SAVersion");
} elsif (defined $ext_prog && $ext_prog eq 'fetch') {
push(@args, qw(-q -n -a -w 20 -m -o), $out_fname_short);
push(@args, '-m') if $out_fname_exists && !$force_reload;
+ push(@args, "--user-agent=sa-update/$VERSION/$SAVersion");
} elsif ($have_lwp) {
dbg("http: no external tool for download, fallback to using LWP") if !$opt{'httputil'};
my $ims;