You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by do...@apache.org on 2006/10/04 00:06:35 UTC

svn commit: r452654 - /spamassassin/branches/3.1/lib/Mail/SpamAssassin/EvalTests.pm

Author: dos
Date: Tue Oct  3 15:06:34 2006
New Revision: 452654

URL: http://svn.apache.org/viewvc?view=rev&rev=452654
Log:
bug 4940: _get_date_header_time() should try dates one at a time not all dates joined together

Modified:
    spamassassin/branches/3.1/lib/Mail/SpamAssassin/EvalTests.pm

Modified: spamassassin/branches/3.1/lib/Mail/SpamAssassin/EvalTests.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/lib/Mail/SpamAssassin/EvalTests.pm?view=diff&rev=452654&r1=452653&r2=452654
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin/EvalTests.pm Tue Oct  3 15:06:34 2006
@@ -1832,13 +1832,15 @@
 
   my $time;
   # a Resent-Date: header takes precedence over any Date: header
-  for my $header ('Resent-Date', 'Date') {
-    my $date = $self->get($header);
-    if (defined($date) && length($date)) {
-      chomp($date);
-      $time = Mail::SpamAssassin::Util::parse_rfc822_date($date);
+  DATE: for my $header ('Resent-Date', 'Date') {
+    my @dates = $self->{msg}->get_header($header);
+    for my $date (@dates) {
+      if (defined($date) && length($date)) {
+        chomp($date);
+        $time = Mail::SpamAssassin::Util::parse_rfc822_date($date);
+      }
+      last DATE if defined($time);
     }
-    last if defined($time);
   }
   if (defined($time)) {
     $self->{date_header_time} = $time;