* spamassassin
Must replace any existing X-Spam headers with local score, rather than adding. Don't care what other SA instances thought. (Michael Holzt) git-svn-id: https://svn.perl.org/qpsmtpd/trunk@330 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
parent
b5ef3d3add
commit
9cd26b24c4
@ -144,7 +144,7 @@ sub check_spam {
|
||||
my $line0 = <SPAMD>; # get the first protocol lines out
|
||||
if ($line0) {
|
||||
$self->log(6, "check_spam: spamd: $line0");
|
||||
$transaction->header->add("X-Spam-Check-By", $self->qp->config('me'), 0);
|
||||
$transaction->header->replace("X-Spam-Check-By", $self->qp->config('me'), 0);
|
||||
}
|
||||
|
||||
my ($flag, $hits, $required);
|
||||
@ -162,8 +162,8 @@ sub check_spam {
|
||||
$flag = $flag eq 'True' ? 'Yes' : 'No';
|
||||
$self->log(6, "check_spam: finished reading from spamd");
|
||||
|
||||
$transaction->header->add('X-Spam-Flag', 'YES', 0) if ($flag eq 'Yes');
|
||||
$transaction->header->add('X-Spam-Status',
|
||||
$transaction->header->replace('X-Spam-Flag', 'YES', 0) if ($flag eq 'Yes');
|
||||
$transaction->header->replace('X-Spam-Status',
|
||||
"$flag, hits=$hits required=$required\n" .
|
||||
"\ttests=$tests", 0);
|
||||
$self->log(5, "check_spam: $flag, hits=$hits, required=$required, " .
|
||||
|
Loading…
Reference in New Issue
Block a user