svn commit: r216067 - in /spamassassin/trunk: MANIFEST lib/Mail/SpamAssassin/PerMsgStatus.pm t/data/testplugin.pm

[jm...@apache.org]

Author: jm
Date: Tue Jul 12 17:57:55 2005
New Revision: 216067

URL: http://svn.apache.org/viewcvs?rev=216067&view=rev
Log:
bug 4322: RelayCountry was failing to be useful for rules, since metadata could no longer be used from rules.  fixed

Modified:
    spamassassin/trunk/MANIFEST
    spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
    spamassassin/trunk/t/data/testplugin.pm

Modified: spamassassin/trunk/MANIFEST
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/MANIFEST?rev=216067&r1=216066&r2=216067&view=diff
==============================================================================
--- spamassassin/trunk/MANIFEST (original)
+++ spamassassin/trunk/MANIFEST Tue Jul 12 17:57:55 2005
@@ -375,6 +375,7 @@
 t/lang_pl_tests.t
 t/memory_cycles.t
 t/meta.t
+t/metadata.t
 t/mimeheader.t
 t/mimeparse.t
 t/missing_hb_separator.t

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=216067&r1=216066&r2=216067&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Tue Jul 12 17:57:55 2005
@@ -1466,7 +1466,12 @@
   # a conventional header
   else {
     $result = join('', $self->{msg}->get_header($request, $getraw));
-    $result = undef if !$result;
+
+    # metadata
+    if (!$result) {
+      $result = $self->{msg}->get_metadata($request);
+      $result = undef if !$result;
+    }
   }
       
   # special queries

Modified: spamassassin/trunk/t/data/testplugin.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/data/testplugin.pm?rev=216067&r1=216066&r2=216067&view=diff
==============================================================================
--- spamassassin/trunk/t/data/testplugin.pm (original)
+++ spamassassin/trunk/t/data/testplugin.pm Tue Jul 12 17:57:55 2005
@@ -68,6 +68,14 @@
   return 1;
 }
 
+sub extract_metadata {
+  my ($self, $opts) = @_;
+  my $msg = $opts->{msg};
+  print "myTestPlugin extract_metadata: $self\n";
+  $msg->put_metadata("Plugin-Meta-Test", "bar");
+  return 1;
+}
+
 sub per_msg_finish {
   my ($self, $permsgstatus) = @_;
   print "myTestPlugin finishing: $self\n";