[SACVS] CVS: spamassassin/lib/Mail/SpamAssassin PerMsgStatus.pm,1.350,1.351

Update of /cvsroot/spamassassin/spamassassin/lib/Mail/SpamAssassin
In directory sc8-pr-cvs1:/tmp/cvs-serv31241/lib/Mail/SpamAssassin

Modified Files:
        PerMsgStatus.pm 
Log Message:
bug 2395: 2.60 allows the addition of custom headers, so we should,
at minimum, remove the ones SA is configured to add.


Index: PerMsgStatus.pm
===================================================================
RCS file: 
/cvsroot/spamassassin/spamassassin/lib/Mail/SpamAssassin/PerMsgStatus.pm,v
retrieving revision 1.350
retrieving revision 1.351
diff -b -w -u -d -r1.350 -r1.351
--- PerMsgStatus.pm     13 Sep 2003 17:27:06 -0000      1.350
+++ PerMsgStatus.pm     15 Sep 2003 03:02:15 -0000      1.351
@@ -2502,6 +2502,12 @@
   $self->{msg}->delete_header ("X-Spam-Prev-Content-Type");
   $self->{msg}->delete_header ("X-Spam-Report");
   $self->{msg}->delete_header ("X-Spam-Status");
+  foreach my $header (keys %{$self->{conf}->{headers_spam}} ) {
+    $self->{msg}->delete_header ("X-Spam-$header");
+  }
+  foreach my $header (keys %{$self->{conf}->{headers_ham}} ) {
+    $self->{msg}->delete_header ("X-Spam-$header");
+  }
 }
 
 ###########################################################################



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf