You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2007/09/13 12:41:42 UTC

svn commit: r575252 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/VBounce.pm

Author: jm
Date: Thu Sep 13 03:41:38 2007
New Revision: 575252

URL: http://svn.apache.org/viewvc?rev=575252&view=rev
Log:
bug 5492: use get_pristine_body() API instead of more complex get_pristine() usage, thanks to Henrik Krohns

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=575252&r1=575251&r2=575252&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/VBounce.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/VBounce.pm Thu Sep 13 03:41:38 2007
@@ -115,19 +115,8 @@
   # now check any "message/anything" attachment MIME parts, too.
   # don't use the more efficient find_parts() method until bug 5331 is
   # fixed, otherwise we'll miss some messages due to their MIME structure
-  
-  my $pristine = $pms->{msg}->get_pristine();
-  # skip past the headers
-  my $foundnlnl = 0;
-  foreach my $line ($pristine =~ /^(.*)$/gm) {
-    # note: do not use any re match here, it'll reset /g
-    if ($line eq "" || $line eq "\012" || $line eq "\015\012") {
-      $foundnlnl = 1; last;
-    }
-  }
-  return 0 unless $foundnlnl;
 
-  # and now through the pristine body
+  my $pristine = $pms->{msg}->get_pristine_body();
   foreach my $line ($pristine =~ /^(.*)$/gm) {
     next unless $line && ($line =~ /Received: /);
     while ($line =~ / (\S+\.\S+) /g) {