Correct handling of Resent-Date headers. Fixes: #590

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 804544f58d117dcf03d5a00d4d85b39114a162c4..98c8ad403a782ab566cbeb87334f57c88e090c19 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.560 2009/01/02 16:58:05 nm4 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.561 2009/01/02 17:12:03 nm4 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -88,6 +88,9 @@ NM/11 Bugzilla 749: Preserve old behaviour of blanks comparing equal to zero.
 
 NM/12 Bugzilla 497: Correct behaviour of exiwhat when no config exists.
 
 
 NM/12 Bugzilla 497: Correct behaviour of exiwhat when no config exists.
 

+NM/13 Bugzilla 590: Correct handling of Resent-Date headers.
+      Patch provided by Brad "anomie" Jorsch
+

 
 Exim version 4.69
 -----------------
 
 Exim version 4.69
 -----------------

diff --git a/src/src/receive.c b/src/src/receive.c
index 4d97a19300721e207c1f8e4ecc376b18ee298844..f0df716df05d17314bfd67023d9fc3f8e4bdaf6b 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/receive.c,v 1.44 2008/01/22 19:23:46 fanf2 Exp $ */
+/* $Cambridge: exim/src/src/receive.c,v 1.45 2009/01/02 17:12:03 nm4 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -1947,7 +1947,7 @@ for (h = header_list->next; h != NULL; h = h->next)
     /* Record whether a Date: or Resent-Date: header exists, as appropriate. */
 
     case htype_date:
     /* Record whether a Date: or Resent-Date: header exists, as appropriate. */
 
     case htype_date:

-    date_header_exists = !resents_exist || is_resent;
+    if (!resents_exist || is_resent) date_header_exists = TRUE;

     break;
 
     /* Same comments as about Return-Path: below. */
     break;
 
     /* Same comments as about Return-Path: below. */