You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2009/08/26 11:10:22 UTC
svn commit: r807936 - in /spamassassin/trunk/lib/Mail: SpamAssassin.pm
SpamAssassin/Conf.pm SpamAssassin/PerMsgStatus.pm
Author: mmartinec
Date: Wed Aug 26 09:10:22 2009
New Revision: 807936
URL: http://svn.apache.org/viewvc?rev=807936&view=rev
Log:
added tag _ADDEDHEADER_ for completeness;
consmetics/consistency: drop redundant 'return' in short
anonymous subroutines declared for tags in _get_tag()
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin.pm?rev=807936&r1=807935&r2=807936&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm Wed Aug 26 09:10:22 2009
@@ -1569,6 +1569,7 @@
if (defined $end && (!defined $latest || $latest < $end)) {
$latest = $end;
}
+ dbg("timing: start but no end: $name") if defined $start && !defined $end;
}
my $total =
(!defined $latest || !defined $earliest) ? 0 : $latest - $earliest;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=807936&r1=807935&r2=807936&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Wed Aug 26 09:10:22 2009
@@ -3180,6 +3180,7 @@
_TIMING_ timing breakdown report
_ADDEDHEADERHAM_ resulting header fields as requested by add_header for spam
_ADDEDHEADERSPAM_ resulting header fields as requested by add_header for ham
+ _ADDEDHEADER_ same as ADDEDHEADERHAM for ham or ADDEDHEADERSPAM for spam
If a tag reference uses the name of a tag which is not in this list or defined
by a loaded plugin, the reference will be left intact and not replaced by any
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=807936&r1=807935&r2=807936&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Wed Aug 26 09:10:22 2009
@@ -1141,30 +1141,28 @@
},
REMOTEHOSTNAME => sub {
- $self->{tag_data}->{'REMOTEHOSTNAME'} ||
- "localhost";
+ $self->{tag_data}->{'REMOTEHOSTNAME'} || "localhost";
},
REMOTEHOSTADDR => sub {
- $self->{tag_data}->{'REMOTEHOSTADDR'} ||
- "127.0.0.1";
+ $self->{tag_data}->{'REMOTEHOSTADDR'} || "127.0.0.1";
},
LASTEXTERNALIP => sub {
my $lasthop = $self->{relays_external}->[0];
- return $lasthop ? $lasthop->{ip} : '';
+ $lasthop ? $lasthop->{ip} : '';
},
LASTEXTERNALRDNS => sub {
my $lasthop = $self->{relays_external}->[0];
- return $lasthop ? $lasthop->{rdns} : '';
+ $lasthop ? $lasthop->{rdns} : '';
},
LASTEXTERNALHELO => sub {
my $lasthop = $self->{relays_external}->[0];
- return $lasthop ? $lasthop->{helo} : '';
+ $lasthop ? $lasthop->{helo} : '';
},
- CONTACTADDRESS => sub { $self->{conf}->{report_contact}; },
+ CONTACTADDRESS => sub { $self->{conf}->{report_contact} },
BAYES => sub {
defined($self->{bayes_score}) ?
@@ -1177,21 +1175,21 @@
my $arg = (shift || "*");
my $length = int($self->{score});
$length = 50 if $length > 50;
- return $arg x $length;
+ $arg x $length;
},
- AUTOLEARN => sub { return $self->get_autolearn_status(); },
+ AUTOLEARN => sub { $self->get_autolearn_status() },
- AUTOLEARNSCORE => sub { return $self->get_autolearn_points(); },
+ AUTOLEARNSCORE => sub { $self->get_autolearn_points() },
TESTS => sub {
my $arg = (shift || ',');
- return (join($arg, sort(@{$self->{test_names_hit}})) || "none");
+ join($arg, sort(@{$self->{test_names_hit}})) || "none";
},
SUBTESTS => sub {
my $arg = (shift || ',');
- return (join($arg, sort(@{$self->{subtest_names_hit}})) || "none");
+ join($arg, sort(@{$self->{subtest_names_hit}})) || "none";
},
TESTSSCORES => sub {
@@ -1204,30 +1202,27 @@
$line .= $arg . $test . "=" . $self->{conf}->{scores}->{$test};
}
}
- return $line ? $line : 'none';
+ $line ? $line : 'none';
},
PREVIEW => sub { $self->get_content_preview() },
- REPORT => sub {
- return "\n" . ($self->{tag_data}->{REPORT} || "");
- },
+ REPORT => sub { "\n" . ($self->{tag_data}->{REPORT} || "") },
HEADER => sub {
my $hdr = shift || return;
- return $self->get($hdr,undef);
+ $self->get($hdr,undef);
},
- TIMING => sub {
- return $self->{main}->timer_report();
- },
+ TIMING => sub { $self->{main}->timer_report() },
- ADDEDHEADERHAM => sub {
- return $self->_get_added_headers('headers_ham');
- },
+ ADDEDHEADERHAM => sub { $self->_get_added_headers('headers_ham') },
+
+ ADDEDHEADERSPAM=> sub { $self->_get_added_headers('headers_spam') },
- ADDEDHEADERSPAM => sub {
- return $self->_get_added_headers('headers_spam');
+ ADDEDHEADER => sub {
+ $self->_get_added_headers(
+ $self->{is_spam} ? 'headers_spam' : 'headers_ham');
},
);