Return-Path: Delivered-To: apmail-spamassassin-commits-archive@www.apache.org Received: (qmail 38969 invoked from network); 3 May 2006 17:59:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 May 2006 17:59:49 -0000 Received: (qmail 74159 invoked by uid 500); 3 May 2006 17:59:41 -0000 Delivered-To: apmail-spamassassin-commits-archive@spamassassin.apache.org Received: (qmail 74142 invoked by uid 500); 3 May 2006 17:59:41 -0000 Mailing-List: contact commits-help@spamassassin.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "SpamAssassin Dev" List-Id: Delivered-To: mailing list commits@spamassassin.apache.org Received: (qmail 74131 invoked by uid 99); 3 May 2006 17:59:40 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 May 2006 10:59:40 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 03 May 2006 10:59:40 -0700 Received: (qmail 38763 invoked by uid 65534); 3 May 2006 17:59:16 -0000 Message-ID: <20060503175915.38582.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r399368 - in /spamassassin/trunk/lib/Mail/SpamAssassin: Conf.pm PerMsgStatus.pm Date: Wed, 03 May 2006 17:58:56 -0000 To: commits@spamassassin.apache.org From: felicity@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: felicity Date: Wed May 3 10:58:52 2006 New Revision: 399368 URL: http://svn.apache.org/viewcvs?rev=399368&view=rev Log: bug 4888: add in a _HEADER(...)_ tag to include information from headers Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=399368&r1=399367&r2=399368&view=diff ============================================================================== --- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original) +++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Wed May 3 10:58:52 2006 @@ -2756,6 +2756,8 @@ _REPORT_ terse report of tests hit (for header reports) _SUMMARY_ summary of tests hit for standard report (for body reports) _CONTACTADDRESS_ contents of the 'report_contact' setting + _HEADER(NAME)_ includes the value of a message header. value is the same + as is found for header rules (see elsewhere in this doc) If a tag reference uses the name of a tag which is not in this list or defined by a loaded plugin, the reference will be left intact and not replaced by any Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=399368&r1=399367&r2=399368&view=diff ============================================================================== --- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original) +++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Wed May 3 10:58:52 2006 @@ -1270,6 +1270,11 @@ return "\n" . ($self->{tag_data}->{REPORT} || ""); }, + HEADER => sub { + my $hdr = shift || return; + return $self->get($hdr); + }, + ); my $data = "";