svn commit: rev 36540 - spamassassin/trunk/lib/Mail/SpamAssassin

[fe...@apache.org]

Author: felicity
Date: Tue Aug 17 14:01:11 2004
New Revision: 36540

Modified:
   spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
Log:
bug 3692: DCC eval code was trying to check for DCC headers already in the message indicating bulk status, but wasn't actually looking at the right header(s).

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm	Tue Aug 17 14:01:11 2004
@@ -2608,8 +2608,7 @@
   # First check if there's already a X-DCC header with value of "bulk"
   # and short-circuit if there is -- someone upstream might already have
   # checked DCC for us.
-  $_ = $self->get('X-DCC-(?:[^:]+-)?Metrics');
-  return 1 if /bulk/;
+  return 1 if grep(/^X-DCC-(?:[^:]{1,80}-)?Metrics:/ && /bulk/, $self->{msg}->get_all_headers());
   
   if ($have_dccifd) {
     return $self->dccifd_lookup($full);