svn commit: r418174 - in /spamassassin/branches/3.1/lib/Mail/SpamAssassin: PerMsgStatus.pm Plugin/DCC.pm Plugin/Pyzor.pm

[fe...@apache.org]

Author: felicity
Date: Thu Jun 29 20:29:09 2006
New Revision: 418174

URL: http://svn.apache.org/viewvc?rev=418174&view=rev
Log:
bug 4924: initialize tag data for DCCB, DCCR, PYZOR, RBL, and BAYESTC*

Modified:
    spamassassin/branches/3.1/lib/Mail/SpamAssassin/PerMsgStatus.pm
    spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/DCC.pm
    spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/Pyzor.pm

Modified: spamassassin/branches/3.1/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=418174&r1=418173&r2=418174&view=diff
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin/PerMsgStatus.pm Thu Jun 29 20:29:09 2006
@@ -1265,7 +1265,8 @@
       $data = $data->(@_);
     }
   }
-  else {
+  # known valid tags that might not get defined in some circumstances
+  elsif ($tag !~ /^(?:BAYESTC(?:|LEARNED|SPAMMY|HAMMY)|RBL)$/) {
     return;
   }
   $data = "" unless defined $data;

Modified: spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/DCC.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/DCC.pm?rev=418174&r1=418173&r2=418174&view=diff
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/DCC.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/DCC.pm Thu Jun 29 20:29:09 2006
@@ -362,9 +362,15 @@
 
   # short-circuit if there's already a X-DCC header with value of
   # "bulk" from an upstream DCC check
-  if ($permsgstatus->get('ALL') =~ /^X-DCC-(?:[^:]{1,80}-)?Metrics:.*bulk/m) {
+  if ($permsgstatus->get('ALL') =~ /^X-DCC-([^:]{1,80})?-?Metrics:.*bulk/m) {
+    $permsgstatus->{tag_data}->{DCCB} = $1;
+    $permsgstatus->{tag_data}->{DCCR} = "bulk";
     return 1;
   }
+
+  # initialize valid tags
+  $permsgstatus->{tag_data}->{DCCB} = "";
+  $permsgstatus->{tag_data}->{DCCR} = "";
 
   $self->get_dcc_interface();
   return 0 if $self->{dcc_disabled};

Modified: spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/Pyzor.pm?rev=418174&r1=418173&r2=418174&view=diff
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/Pyzor.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin/Plugin/Pyzor.pm Thu Jun 29 20:29:09 2006
@@ -215,6 +215,9 @@
 sub check_pyzor {
   my ($self, $permsgstatus, $full) = @_;
 
+  # initialize valid tags
+  $permsgstatus->{tag_data}->{PYZOR} = "";
+
   $self->get_pyzor_interface();
   return 0 unless $self->{pyzor_available};