You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fa...@apache.org on 2007/05/02 17:17:43 UTC
svn commit: r534510 -
/spamassassin/branches/3.2/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
Author: fanf
Date: Wed May 2 08:17:42 2007
New Revision: 534510
URL: http://svn.apache.org/viewvc?view=rev&rev=534510
Log:
Backport fix for bug #5102
Modified:
spamassassin/branches/3.2/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
Modified: spamassassin/branches/3.2/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.2/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm?view=diff&rev=534510&r1=534509&r2=534510
==============================================================================
--- spamassassin/branches/3.2/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm (original)
+++ spamassassin/branches/3.2/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm Wed May 2 08:17:42 2007
@@ -348,7 +348,9 @@
if ($self->gated_through_received_hdr_remover($pms)) { return; }
- if ($rcvd =~ /from \S*hotmail.com \(\S+\.hotmail(?:\.msn)?\.com[ \)]/ && $ip)
+ if ($rcvd =~ /from (\S*\.)?hotmail.com \(\S+\.hotmail(?:\.msn)?\.com[ \)]/ && $ip)
+ { return; }
+ if ($rcvd =~ /from \S*\.hotmail.com \(\[$IP_ADDRESS\][ \):]/ && $ip)
{ return; }
if ($rcvd =~ /from \S+ by \S+\.hotmail(?:\.msn)?\.com with HTTP\;/ && $ip)
{ return; }