You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2006/12/30 22:11:23 UTC
svn commit: r491312 - in /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin:
HeaderEval.pm SPF.pm
Author: felicity
Date: Sat Dec 30 13:11:22 2006
New Revision: 491312
URL: http://svn.apache.org/viewvc?view=rev&rev=491312
Log:
bug 4747: use EnvelopeFrom:addr when we want the address and not the full header
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm?view=diff&rev=491312&r1=491311&r2=491312
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm Sat Dec 30 13:11:22 2006
@@ -398,7 +398,7 @@
return 0 unless $pms->get('Message-Id') =~ /^<\S+\@$server>/;
} else {
return 0 unless $pms->get('Message-Id') =~ /^<$listname-\S+\@groups\.msn\.com>/;
- return 0 unless $pms->get('EnvelopeFrom') =~ /$listname-bounce\@groups\.msn\.com/;
+ return 0 unless $pms->get('EnvelopeFrom:addr') =~ /$listname-bounce\@groups\.msn\.com/;
}
return 1;
@@ -1092,7 +1092,7 @@
my ($self, $pms) = @_;
my $to = $pms->get('To:addr');
- my $from = $pms->get('EnvelopeFrom');
+ my $from = $pms->get('EnvelopeFrom:addr');
return 0 unless ($to && $from);
return 0 if ($from =~ /^SRS\d=/);
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm?view=diff&rev=491312&r1=491311&r2=491312
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm Sat Dec 30 13:11:22 2006
@@ -643,7 +643,7 @@
# from the Return-Path, X-Envelope-From, or whatever header.
# it's better to get it from Received though, as that is updated
# hop-by-hop.
- $sender = $scanner->get ("EnvelopeFrom");
+ $sender = $scanner->get ("EnvelopeFrom:addr");
}
if (!$sender) {