From 4c69d561122718efebb6e0aec43bc5afa4958657 Mon Sep 17 00:00:00 2001
From: Nigel Metheringham <nigel@exim.org>
Date: Fri, 2 Jan 2009 17:12:03 +0000
Subject: [PATCH] Correct handling of Resent-Date headers.  Fixes: #590

---
 doc/doc-txt/ChangeLog | 5 ++++-
 src/src/receive.c     | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 804544f58..98c8ad403 100644
--- 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
 -------------------------------------------
@@ -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/13 Bugzilla 590: Correct handling of Resent-Date headers.
+      Patch provided by Brad "anomie" Jorsch
+
 
 Exim version 4.69
 -----------------
diff --git a/src/src/receive.c b/src/src/receive.c
index 4d97a1930..f0df716df 100644
--- 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    *
@@ -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:
-    date_header_exists = !resents_exist || is_resent;
+    if (!resents_exist || is_resent) date_header_exists = TRUE;
     break;
 
     /* Same comments as about Return-Path: below. */
-- 
2.30.2