Replace all occurances of CR in X-Spam-Status

The hack for outlook (replacing CR in X-Spam-Status header) assumes
that there is only a single occurance of CR. However, if spamassassin
adds some more spam status information X-Spam-Status might be several lines
long leading to multiple occurance of CR.
This fix changes the substitute to a global subsititute, replacing all
CRs in the X-SPam-Status header.
This commit is contained in:
Christian Eisendle 2016-02-16 22:03:57 +01:00
parent 66e76f5796
commit 4d061dfa89

View File

@ -273,7 +273,7 @@ sub insert_spam_headers {
if ($name eq 'X-Spam-Status') { if ($name eq 'X-Spam-Status') {
$self->parse_spam_header($new_headers->{$name}); $self->parse_spam_header($new_headers->{$name});
} }
$new_headers->{$name} =~ s/\015//; # hack for outlook $new_headers->{$name} =~ s/\015//g; # hack for outlook
$self->_cleanup_spam_header($transaction, $name); $self->_cleanup_spam_header($transaction, $name);
$transaction->header->add($name, $new_headers->{$name}, 0); $transaction->header->add($name, $new_headers->{$name}, 0);
} }