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 2008/04/18 01:01:48 UTC
svn commit: r649324 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/VBounce.pm
Author: mmartinec
Date: Thu Apr 17 16:01:40 2008
New Revision: 649324
URL: http://svn.apache.org/viewvc?rev=649324&view=rev
Log:
VBounce.pm: relax r644752 and allow [> ]* before Received
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/VBounce.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/VBounce.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/VBounce.pm?rev=649324&r1=649323&r2=649324&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/VBounce.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/VBounce.pm Thu Apr 17 16:01:40 2008
@@ -106,7 +106,7 @@
# check the plain-text body, first
foreach my $line (@{$body}) {
- next unless ($line =~ /^Received:/i);
+ next unless ($line =~ /^[> ]*Received:/i);
while ($line =~ / (\S+\.\S+) /g) {
return 1 if $self->_relay_is_in_whitelist_bounce_relays($pms, $1);
}
@@ -118,7 +118,7 @@
my $pristine = $pms->{msg}->get_pristine_body();
foreach my $line ($pristine =~ /^(.*)$/gm) {
- next unless $line && ($line =~ /^Received:/i);
+ next unless $line && ($line =~ /^[> ]*Received:/i);
while ($line =~ / (\S+\.\S+) /g) {
return 1 if $self->_relay_is_in_whitelist_bounce_relays($pms, $1);
}