Add References: support to autoreply.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 45ea2866d3e10e23fb80e6d997a28baae5dc5bc4..bbf590a1eac9af03ac496de3cf373c091515da27 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.313 2006/02/23 12:41:22 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.314 2006/02/28 11:25:40 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -236,6 +236,9 @@ PH/45 When the plaintext authenticator is running as a client, the server's
       challenges. If an invalid string is ignored, an empty string is placed in
       the variable.
 
+PH/46 Messages that are created by the autoreply transport now contains a
+      References: header, in accordance with RFCs 2822 and 3834.
+
 
 Exim version 4.60
 -----------------

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index c807d931be51ca3f8d883fce01eec76a9c3b6424..04fedd63344575ae2c1582b5f3396e4eeb94322a 100644 (file)
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.90 2006/02/23 12:41:22 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.91 2006/02/28 11:25:40 ph10 Exp $
 
 New Features in Exim
 --------------------
@@ -87,6 +87,17 @@ PH/13 When the plaintext authenticator is running as a client, the challenges
       this way. If an invalid base64 string is received when client_ignore_
       invalid_base64 is set, an empty string is put in the $auth<n> variable.
 
+PH/14 Messages created by the autoreply transport now contain a References:
+      header. This is constructed in accordance with rules that are described
+      in section 3.64 of RFC 2822, which states that replies should contain
+      such a header line, and section 3.14 of RFC 3834, which states that
+      automatic responses are not different in this respect. However, because
+      some mail processing software does not cope well with very long header
+      lines, no more than 12 message IDs are copied from the References: header
+      line in the incoming message. If there are more than 12, the first one
+      and then the final 11 are copied, before adding the message ID of the
+      incoming message.
+
 
 Version 4.60
 ------------

diff --git a/src/src/functions.h b/src/src/functions.h
index fdcfd55d21580fa7ad38604fbbc57f4610ec56b2..9b8bfacf2021330d1f720ee3fac5b74fa8fea343 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/functions.h,v 1.22 2006/02/22 14:46:44 ph10 Exp $ */
+/* $Cambridge: exim/src/src/functions.h,v 1.23 2006/02/28 11:25:40 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -175,6 +175,7 @@ extern int     parse_forward_list(uschar *, int, address_item **, uschar **,
 extern uschar *parse_find_address_end(uschar *, BOOL);
 extern uschar *parse_find_at(uschar *);
 extern uschar *parse_fix_phrase(uschar *, int, uschar *, int);
+extern uschar *parse_message_id(uschar *, uschar **, uschar **);
 extern uschar *parse_quote_2047(uschar *, int, uschar *, uschar *, int);
 
 extern BOOL    queue_action(uschar *, int, uschar **, int, int);

diff --git a/src/src/parse.c b/src/src/parse.c
index 67d9e148c3655e8e895153c710b76daa0965cf80..182df8026cdce1d6b5f298fbe6f0bd0845530ddb 100644 (file)
--- a/src/src/parse.c
+++ b/src/src/parse.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/parse.c,v 1.7 2006/02/07 11:19:00 ph10 Exp $ */
+/* $Cambridge: exim/src/src/parse.c,v 1.8 2006/02/28 11:25:40 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -1656,6 +1656,68 @@ for (;;)
 }
 
 
+
+/*************************************************
+*            Extract a Message-ID                *
+*************************************************/
+
+/* This function is used to extract message ids from In-Reply-To: and
+References: header lines.
+
+Arguments:
+  str          pointer to the start of the message-id
+  yield        put pointer to the message id (in dynamic memory) here
+  error        put error message here on failure
+
+Returns:       points after the processed message-id or NULL on error
+*/
+
+uschar *
+parse_message_id(uschar *str, uschar **yield, uschar **error)
+{
+uschar *domain = NULL;
+uschar *id;
+
+str = skip_comment(str);
+if (*str != '<')
+  {
+  *error = US"Missing '<' before message-id";
+  return NULL;
+  }
+
+/* Getting a block the size of the input string will definitely be sufficient
+for the answer, but it may also be very long if we are processing a header
+line. Therefore, take care to release unwanted store afterwards. */
+
+id = *yield = store_get(Ustrlen(str) + 1);
+*id++ = *str++;
+
+str = read_addr_spec(str, id, '>', error, &domain);
+
+if (*error == NULL)
+  {
+  if (*str != '>') *error = US"Missing '>' after message-id";
+    else if (domain == NULL) *error = US"domain missing in message-id";
+  }
+
+if (*error != NULL)
+  {
+  store_reset(*yield);
+  return NULL;
+  }
+
+while (*id != 0) id++;
+*id++ = *str++;
+*id++ = 0;
+store_reset(id);
+
+str = skip_comment(str);
+return str;
+}
+
+
+
+
 /*************************************************
 **************************************************
 *             Stand-alone test program           *
@@ -1788,6 +1850,26 @@ while (Ufgets(buffer, sizeof(buffer), stdin) != NULL)
   else printf("Failed: %d %s\n", extracted, errmess);
   }
 
+printf("Testing parse_message_id\n");
+
+while (Ufgets(buffer, sizeof(buffer), stdin) != NULL)
+  {
+  uschar *s, *t, *errmess;
+  buffer[Ustrlen(buffer) - 1] = 0;
+  if (buffer[0] == 0) break;
+  s = buffer;
+  while (*s != 0)
+    {
+    s = parse_message_id(s, &t, &errmess);
+    if (errmess != NULL)
+      {
+      printf("Failed: %s\n", errmess);
+      break;
+      }
+    printf("%s\n", t);
+    }
+  }
+
 return 0;
 }
 

diff --git a/src/src/transports/autoreply.c b/src/src/transports/autoreply.c
index 719e358afa19b0cefa4a85199bbcf1e2f3cf116b..c16cf6e2f8f28e243c18fdea1285b0d112374410 100644 (file)
--- a/src/src/transports/autoreply.c
+++ b/src/src/transports/autoreply.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/transports/autoreply.c,v 1.8 2006/02/07 11:19:03 ph10 Exp $ */
+/* $Cambridge: exim/src/src/transports/autoreply.c,v 1.9 2006/02/28 11:25:40 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -277,6 +277,7 @@ uschar *from, *reply_to, *to, *cc, *bcc, *subject, *headers, *text, *file;
 uschar *logfile, *oncelog;
 uschar *cache_buff = NULL;
 uschar *cache_time = NULL;
+uschar *message_id = NULL;
 header_line *h;
 time_t now = time(NULL);
 time_t once_repeat_sec = 0;
@@ -590,9 +591,57 @@ for (h = header_list; h != NULL; h = h->next)
 
 if (h != NULL)
   {
-  uschar *s = Ustrchr(h->text, ':') + 1;
-  while (isspace(*s)) s++;
-  fprintf(f, "In-Reply-To: %s", s);
+  message_id = Ustrchr(h->text, ':') + 1;
+  while (isspace(*message_id)) message_id++;
+  fprintf(f, "In-Reply-To: %s", message_id);
+  }
+
+/* Generate a References header if there is at least one of Message-ID:,
+References:, or In-Reply-To: (see RFC 2822). */
+
+for (h = header_list; h != NULL; h = h->next)
+  if (h->type != htype_old && strncmpic(US"References:", h->text, 11) == 0)
+    break;
+
+if (h == NULL)
+  for (h = header_list; h != NULL; h = h->next)
+    if (h->type != htype_old && strncmpic(US"In-Reply-To:", h->text, 12) == 0)
+      break;
+
+/* We limit the total length of references.  Although there is no fixed
+limit, some systems do not like headers growing beyond recognition.
+Keep the first message ID for the thread root and the last few for
+the position inside the thread, up to a maximum of 12 altogether. */
+
+if (h != NULL || message_id != NULL)
+  {
+  fprintf(f, "References:");
+  if (h != NULL)
+    {
+    uschar *s, *id, *error;
+    uschar *referenced_ids[12];
+    int reference_count = 0;
+    int i;
+
+    s = Ustrchr(h->text, ':') + 1;
+    parse_allow_group = FALSE;
+    while (*s != 0 && (s = parse_message_id(s, &id, &error)) != NULL)
+      {
+      if (reference_count == sizeof(referenced_ids)/sizeof(uschar *))
+        {
+        memmove(referenced_ids + 1, referenced_ids + 2,
+           sizeof(referenced_ids) - 2*sizeof(uschar *));
+        referenced_ids[reference_count - 1] = id;
+        }
+      else referenced_ids[reference_count++] = id;
+      }
+    for (i = 0; i < reference_count; ++i) fprintf(f, " %s", referenced_ids[i]);
+    }
+
+  /* The message id will have a newline on the end of it. */
+
+  if (message_id != NULL) fprintf(f, " %s", message_id);
+    else fprintf(f, "\n");
   }
 
 /* Add an Auto-Submitted: header */

diff --git a/test/confs/0530 b/test/confs/0530
new file mode 100644 (file)
index 0000000..b7ad3ff
--- /dev/null
+++ b/test/confs/0530
@@ -0,0 +1,47 @@
+# Exim test configuration 0530
+
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+primary_hostname = myhost.test.ex
+rfc1413_query_timeout = 0s
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = accept control = suppress_local_fixups
+
+
+# ----- Routers -----
+
+begin routers
+
+r1:
+  driver = accept
+  senders = :
+  transport = t1
+
+r2:
+  driver = accept
+  transport = t2
+
+
+# ----- Transports -----
+
+begin transports
+
+t1:
+  driver = appendfile
+  file = DIR/test-mail/$local_part
+  user = CALLER
+
+t2:
+  driver = autoreply
+  to = $sender_address
+  subject = Re: $h_subject:
+  text = This is the text of the autoreply.
+  user = CALLER
+
+# End

diff --git a/test/log/0530 b/test/log/0530
new file mode 100644 (file)
index 0000000..7d69980
--- /dev/null
+++ b/test/log/0530
@@ -0,0 +1,60 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss id=m1@b
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss id=m1@b
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss id=m1@b
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbC-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbB-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss id=m1@b
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmbD-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbE-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbD-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss id=m1@b
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbF-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbG-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbF-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= <> R=10HmbH-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbI-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbH-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmbK-0005vi-00 <= <> R=10HmbJ-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbK-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbJ-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmbM-0005vi-00 <= <> R=10HmbL-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbM-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbL-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmbO-0005vi-00 <= <> R=10HmbN-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbO-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbO-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbN-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmbN-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbP-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmbQ-0005vi-00 <= <> R=10HmbP-0005vi-00 U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbQ-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbQ-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbP-0005vi-00 => userx <userx@test.ex> R=r2 T=t2
+1999-03-02 09:44:33 10HmbP-0005vi-00 Completed

diff --git a/test/mail/0015.userx b/test/mail/0015.userx
index 936b3392f91a39034c28457ea44cce25cd3dc203..29b1e9a9507a153ff1141ad1e756ada8f9615b06 100644 (file)
--- a/test/mail/0015.userx
+++ b/test/mail/0015.userx
@@ -23,6 +23,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -57,6 +58,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
+References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>

diff --git a/test/mail/0016.userx b/test/mail/0016.userx
index 9578d31ea6eac01d19be24cf62dcdaf0609311a3..8e33c3631b0d10193240245cf353c761a4132e68 100644 (file)
--- a/test/mail/0016.userx
+++ b/test/mail/0016.userx
@@ -21,6 +21,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>

diff --git a/test/mail/0037.CALLER b/test/mail/0037.CALLER
index f2bd639221f8c707c92b1e94467ed1f1ef1f8b18..36df0163287a99359261a53f4786b5f96e216d30 100644 (file)
--- a/test/mail/0037.CALLER
+++ b/test/mail/0037.CALLER
@@ -51,6 +51,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 To: CALLER@test.ex
 Subject: An auto reply: qualify_domain=test.ex
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
+References: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER@test.ex
@@ -290,6 +291,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 To: CALLER_NAME <CALLER@test.ex>
 Subject: On vacation
 In-Reply-To: <E10HmbQ-0005vi-00@the.local.host.name>
+References: <E10HmbQ-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbR-0005vi-00@the.local.host.name>
 From: CALLER@test.ex

diff --git a/test/mail/0072.CALLER b/test/mail/0072.CALLER
index 2b41439414d2961a29325914d412dcad355b3530..5199f679ab5f2b438c5a4cfb05e1e1916a24925a 100644 (file)
--- a/test/mail/0072.CALLER
+++ b/test/mail/0072.CALLER
@@ -7,6 +7,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
@@ -23,6 +24,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
+References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
@@ -52,6 +54,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
+References: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
@@ -72,6 +75,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbE-0005vi-00@the.local.host.name>
+References: <E10HmbE-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
@@ -100,6 +104,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: =?ISO-8859-1?Q?CALLER=40test=2Eex?= <CALLER@test.ex>
 In-Reply-To: <E10HmbG-0005vi-00@the.local.host.name>
+References: <E10HmbG-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex

diff --git a/test/mail/0073.CALLER b/test/mail/0073.CALLER
index 5875a0ed7800be9f033126ea27af86377af94d61..45eac6bfe6c7201de5760872c701c63ea5d63873 100644 (file)
--- a/test/mail/0073.CALLER
+++ b/test/mail/0073.CALLER
@@ -7,6 +7,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
@@ -23,6 +24,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
+References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex

diff --git a/test/mail/0074.CALLER b/test/mail/0074.CALLER
index b852afc4923bedb1ddda070298a18b87f7de0528..667c731394b86abb7e8bf9c3c9a572ac44630765 100644 (file)
--- a/test/mail/0074.CALLER
+++ b/test/mail/0074.CALLER
@@ -7,6 +7,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -23,6 +24,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
+References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>

diff --git a/test/mail/0074.userx b/test/mail/0074.userx
index 73e4e3a068a3d931248913cf7929234e29d2068c..fb5be8ac13ed6426f1b0dd04e5d23b4696366ed8 100644 (file)
--- a/test/mail/0074.userx
+++ b/test/mail/0074.userx
@@ -63,6 +63,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex,  abey seedy <abcd@test.ex>
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
+References: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -94,6 +95,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex,   abcd@test.ex
 In-Reply-To: <E10HmbE-0005vi-00@the.local.host.name>
+References: <E10HmbE-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>

diff --git a/test/mail/0079.userx b/test/mail/0079.userx
index 825e700abcfe3dfce34aa19dc9511d8a828306e1..7a5b5233cfbae1e387e77ccafea741b932bbec9a 100644 (file)
--- a/test/mail/0079.userx
+++ b/test/mail/0079.userx
@@ -49,6 +49,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@exim.test.ex
 In-Reply-To: <E10HmaZ-0005vi-00@the.local.host.name>
+References: <E10HmaZ-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER@exim.test.ex

diff --git a/test/mail/0090.CALLER b/test/mail/0090.CALLER
index 9a8c7ae3b474eb104591cb8076ff2396f72d548f..14156674a41d11df4e1b7c2f91d40fedf187aca6 100644 (file)
--- a/test/mail/0090.CALLER
+++ b/test/mail/0090.CALLER
@@ -4,6 +4,7 @@ Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@myhost.test.ex
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: EXIMUSER@myhost.test.ex

diff --git a/test/mail/0114.file b/test/mail/0114.file
index 33023206385055c5bfec57c892c4073cebcd267c..a04c45d00b260c2d353ad7e112128577a4f82b78 100644 (file)
--- a/test/mail/0114.file
+++ b/test/mail/0114.file
@@ -15,6 +15,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 To: A. File <file@test.ex>, No One <null@test.ex>
 Subject: autoreply
 In-Reply-To: <E10HmaZ-0005vi-00@the.local.host.name>
+References: <E10HmaZ-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>

diff --git a/test/mail/0140.CALLER b/test/mail/0140.CALLER
index ae5cdfec8be814580e6876373d5c6f5c92ad98fd..e7882aa43a2f100417c0633cca6d826e13d81055 100644 (file)
--- a/test/mail/0140.CALLER
+++ b/test/mail/0140.CALLER
@@ -7,6 +7,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: Reply Person <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex

diff --git a/test/mail/0177.usery b/test/mail/0177.usery
index 4ce6d8364609954f43393a5f38f98f8368a54f6b..2fc9e36ea1da832669a71146f812b2c3e81a3958 100644 (file)
--- a/test/mail/0177.usery
+++ b/test/mail/0177.usery
@@ -5,6 +5,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 To: usery@test.ex
 Subject: auto fail message
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -19,6 +20,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 To: usery@test.ex
 Subject: auto freeze message
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
+References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -33,6 +35,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 To: usery@test.ex
 Subject: An auto reply: qualify_domain=test.ex
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
+References: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -47,6 +50,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 To: usery@test.ex
 Subject: auto freeze message
 In-Reply-To: <E10HmbE-0005vi-00@the.local.host.name>
+References: <E10HmbE-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -61,6 +65,7 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 To: usery@test.ex
 Subject: auto freeze message
 In-Reply-To: <E10HmbG-0005vi-00@the.local.host.name>
+References: <E10HmbG-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>

diff --git a/test/mail/0222.foo1 b/test/mail/0222.foo1
index 731e0346cde46158ff4f68bdd79dbef058077050..6db0b20c3a53d9bd85dc69271a51597e4edf3c32 100644 (file)
--- a/test/mail/0222.foo1
+++ b/test/mail/0222.foo1
@@ -4,6 +4,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        for foo1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: foo1@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -17,6 +18,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        for foo1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: foo1@test.ex
 In-Reply-To: <E10HmbG-0005vi-00@myhost.test.ex>
+References: <E10HmbG-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

diff --git a/test/mail/0222.foo2 b/test/mail/0222.foo2
index 10720d5833da775c6ed440a318e79b03e7fe8b04..a932aa023122eb0e34e2d23d8385c9437e5226d3 100644 (file)
--- a/test/mail/0222.foo2
+++ b/test/mail/0222.foo2
@@ -4,6 +4,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        for foo2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: foo2@test.ex
 In-Reply-To: <E10HmbA-0005vi-00@myhost.test.ex>
+References: <E10HmbA-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

diff --git a/test/mail/0222.foo3 b/test/mail/0222.foo3
index 8c1cd0f5ce8f70140daaeff6a34bfd0e3dc774dc..5747305249b3491129dc356f5d5ee64c0416cc25 100644 (file)
--- a/test/mail/0222.foo3
+++ b/test/mail/0222.foo3
@@ -4,6 +4,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        for foo3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: foo3@test.ex
 In-Reply-To: <E10HmbD-0005vi-00@myhost.test.ex>
+References: <E10HmbD-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

diff --git a/test/mail/0223.CALLER b/test/mail/0223.CALLER
index 5875a0ed7800be9f033126ea27af86377af94d61..45eac6bfe6c7201de5760872c701c63ea5d63873 100644 (file)
--- a/test/mail/0223.CALLER
+++ b/test/mail/0223.CALLER
@@ -7,6 +7,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
@@ -23,6 +24,7 @@ Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
+References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex

diff --git a/test/mail/0233.postmaster b/test/mail/0233.postmaster
index ce0986b1eb083ca15b4fffcff3afcee5efbe06a7..6c0b1ff4e5ece3b77be2340ddd2cfd324f682adc 100644 (file)
--- a/test/mail/0233.postmaster
+++ b/test/mail/0233.postmaster
@@ -5,6 +5,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 To: postmaster@myhost.test.ex
 Subject: System filter has frozen
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

diff --git a/test/mail/0243.CALLER b/test/mail/0243.CALLER
index f18e3068998b4eaf5108d15a65300b2fa87938a6..11fc70884a4054589b6896ff79b7042a48d21ea3 100644 (file)
--- a/test/mail/0243.CALLER
+++ b/test/mail/0243.CALLER
@@ -8,6 +8,7 @@ Reply-To: x@y,
 To: CALLER@nl.demon.net
 Subject: Re: 
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/0246.CALLER b/test/mail/0246.CALLER
index ae6bd7cd5ff19c630e2306f60eae3c7dbf1f9084..8f9e5141b8ebe8a93b81611fc1ccd7f3482fe1a7 100644 (file)
--- a/test/mail/0246.CALLER
+++ b/test/mail/0246.CALLER
@@ -4,6 +4,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@myhost.test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

diff --git a/test/mail/0404.sender b/test/mail/0404.sender
index 12f342da8d5009bf38f8e3a2d86e6ead8f4d66e3..fd77af8fe4053d3bbebc22d4f9009f1871549333 100644 (file)
--- a/test/mail/0404.sender
+++ b/test/mail/0404.sender
@@ -3,6 +3,7 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@mail.test.ex>
+References: <E10HmaX-0005vi-00@mail.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

diff --git a/test/mail/0428.someone b/test/mail/0428.someone
index 280836aaa8572114cae62707e441c7ce8ef45265..61cee3e9daa6080be8804a8f1052ed7a0a875165 100644 (file)
--- a/test/mail/0428.someone
+++ b/test/mail/0428.someone
@@ -9,6 +9,7 @@ From: userx@test.ex
 To: someone@test.ex
 Subject: =?utf-8?Q?Auto=3A_?=
 In-Reply-To: <E10HmbL-0005vi-00@mail.test.ex>
+References: <E10HmbL-0005vi-00@mail.test.ex>
 Auto-Submitted: auto-replied
 MIME-Version: 1.0
 Content-Type: text/plain;

diff --git a/test/mail/0444.CALLER b/test/mail/0444.CALLER
index 2d3947556cda2a6b9297a30f358272d0ebceec6e..76b76de6b25182fbaccb5220d119f608c891a4e9 100644 (file)
--- a/test/mail/0444.CALLER
+++ b/test/mail/0444.CALLER
@@ -7,6 +7,7 @@ Reply-To: postmaster@test.ex
 To: CALLER@test.ex
 Subject: Submission of mail from CALLER@test.ex directly to the XXX hosts
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@test.ex>

diff --git a/test/mail/0452.CALLER b/test/mail/0452.CALLER
index 27ea508a1761001eb43f13b6ce0690533cca9795..298abf033e7dabf681f1a930014ac0712069893c 100644 (file)
--- a/test/mail/0452.CALLER
+++ b/test/mail/0452.CALLER
@@ -5,6 +5,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 To: CALLER@test.ex
 Subject: Auto generated
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 h1: the first added header
 h2: the second added header

diff --git a/test/mail/0494.userx b/test/mail/0494.userx
index 422d2150c1be977fa66bfe2b7df0b66d00df08ef..4379cb298a479ee34b5127b474e5c8513feab3f0 100644 (file)
--- a/test/mail/0494.userx
+++ b/test/mail/0494.userx
@@ -5,6 +5,7 @@ Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 To: userx@test.ex
 Subject: testing, testing
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: EXIMUSER@myhost.test.ex

diff --git a/test/mail/0530.CALLER b/test/mail/0530.CALLER
new file mode 100644 (file)
index 0000000..d073821
--- /dev/null
+++ b/test/mail/0530.CALLER
@@ -0,0 +1,144 @@
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+       id 10HmaY-0005vi-00
+       for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: Message-id, no References, no In-Reply-to
+In-Reply-To: <m1@b>
+References: <m1@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+       id 10HmbA-0005vi-00
+       for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: Message-id, no References, In-Reply-to
+In-Reply-To: <m1@b>
+References: <i1@b> <m1@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+       id 10HmbC-0005vi-00
+       for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: Message-id, References (1), In-Reply-to
+In-Reply-To: <m1@b>
+References: <r1@b> <m1@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+       id 10HmbE-0005vi-00
+       for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: Message-id, References (5), no In-Reply-to
+In-Reply-To: <m1@b>
+References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b> <m1@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+       id 10HmbG-0005vi-00
+       for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: Message-id, References (15), In-Reply-to
+In-Reply-To: <m1@b>
+References: <r1@b> <r5@b> <r6@b> <r7@b> <r8@b> <r9@b> <r10@b> <r11@b> <r12@b> <r13@b> <r14@b> <r15@b> <m1@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+       id 10HmbI-0005vi-00
+       for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: no Message-id, no References, no In-Reply-to
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+       id 10HmbK-0005vi-00
+       for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: no Message-id, no References, In-Reply-to
+References: <i1@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbK-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+       id 10HmbM-0005vi-00
+       for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: no Message-id, References (1), In-Reply-to
+References: <r1@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbM-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+       id 10HmbO-0005vi-00
+       for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: no Message-id, References (5), no In-Reply-to
+References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbO-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+       id 10HmbQ-0005vi-00
+       for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+To: CALLER@myhost.test.ex
+Subject: Re: no Message-id, References (15), In-Reply-to
+References: <r1@b> <r5@b> <r6@b> <r7@b> <r8@b> <r9@b> <r10@b> <r11@b> <r12@b> <r13@b> <r14@b> <r15@b>
+Auto-Submitted: auto-replied
+Message-Id: <E10HmbQ-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the text of the autoreply.
+

diff --git a/test/scripts/0000-Basic/0530 b/test/scripts/0000-Basic/0530
new file mode 100644 (file)
index 0000000..6c57868
--- /dev/null
+++ b/test/scripts/0000-Basic/0530
@@ -0,0 +1,82 @@
+# autoreply and References: headers
+#
+exim -odi userx@test.ex
+Subject: Message-id, no References, no In-Reply-to
+Message-id: <m1@b>
+****
+exim -odi userx@test.ex
+Subject: Message-id, no References, In-Reply-to
+Message-id: <m1@b>
+In-Reply-To: <i1@b>
+****
+exim -odi userx@test.ex
+Subject: Message-id, References (1), In-Reply-to
+Message-id: <m1@b>
+References: <r1@b>
+In-Reply-To: <i1@b>
+****
+exim -odi userx@test.ex
+Subject: Message-id, References (5), no In-Reply-to
+Message-id: <m1@b>
+References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
+****
+exim -odi userx@test.ex
+Subject: Message-id, References (15), In-Reply-to
+Message-id: <m1@b>
+References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
+            <r6@b> <r7@b> <r8@b> <r9@b> <r10@b>
+            <r11@b> <r12@b> <r13@b> <r14@b> <r15@b> 
+In-Reply-To: <i1@b>
+****
+# In order not to have Exim create a Message-ID: header, we need to set
+# suppress_local_fixups, but the not-smtp ACL is too late. So we must use
+# an SMTP interface.
+#
+exim -odi -bs
+mail from:<CALLER@test.ex>
+rcpt to:<userx@test.ex>
+data
+Subject: no Message-id, no References, no In-Reply-to
+.
+quit
+****
+exim -odi -bs
+mail from:<CALLER@test.ex>
+rcpt to:<userx@test.ex>
+data
+Subject: no Message-id, no References, In-Reply-to
+In-Reply-To: <i1@b>
+.
+quit
+****
+exim -odi -bs
+mail from:<CALLER@test.ex>
+rcpt to:<userx@test.ex>
+data
+Subject: no Message-id, References (1), In-Reply-to
+References: <r1@b>
+In-Reply-To: <i1@b>
+.
+quit
+****
+exim -odi -bs
+mail from:<CALLER@test.ex>
+rcpt to:<userx@test.ex>
+data
+Subject: no Message-id, References (5), no In-Reply-to
+References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
+.
+quit
+****
+exim -odi -bs
+mail from:<CALLER@test.ex>
+rcpt to:<userx@test.ex>
+data
+Subject: no Message-id, References (15), In-Reply-to
+References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
+            <r6@b> <r7@b> <r8@b> <r9@b> <r10@b>
+            <r11@b> <r12@b> <r13@b> <r14@b> <r15@b> 
+In-Reply-To: <i1@b>
+.
+quit
+****

diff --git a/test/stderr/0404 b/test/stderr/0404
index ad1ec2e3848e105b726be01f20fd3491f2467452..eacb762b5fb36d63c173c724616a1150dfa132f2 100644 (file)
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -246,6 +246,7 @@ search_tidyup called
 To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex,
 **** debug string too long - truncated ****
 In-Reply-To: <E10HmaX-0005vi-00@mail.test.ex>
+References: <E10HmaX-0005vi-00@mail.test.ex>
 Auto-Submitted: auto-replied
 
 rewrite_one_header: type=T:
@@ -258,6 +259,7 @@ search_tidyup called
 T To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.e
 **** debug string too long - truncated ****
   In-Reply-To: <E10HmaX-0005vi-00@mail.test.ex>
+  References: <E10HmaX-0005vi-00@mail.test.ex>
   Auto-Submitted: auto-replied
 I Message-Id: <E10HmaY-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
@@ -291,7 +293,7 @@ Non-recipients:
 Empty Tree
 ---- End of tree ----
 recipients_count=608
-body_linecount=1 message_linecount=8
+body_linecount=1 message_linecount=9
 Delivery address list:
   sender@test.ex 
   sender@test.ex 

diff --git a/test/stdout/0530 b/test/stdout/0530
new file mode 100644 (file)
index 0000000..1a39f69
--- /dev/null
+++ b/test/stdout/0530
@@ -0,0 +1,30 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmbH-0005vi-00\r
+221 myhost.test.ex closing connection\r
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmbJ-0005vi-00\r
+221 myhost.test.ex closing connection\r
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmbL-0005vi-00\r
+221 myhost.test.ex closing connection\r
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmbN-0005vi-00\r
+221 myhost.test.ex closing connection\r
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmbP-0005vi-00\r
+221 myhost.test.ex closing connection\r