ph10 2005/08/01 15:00:35 BST
Modified files:
exim-doc/doc-txt ChangeLog NewStuff
exim-src/src expand.c globals.c
exim-test-orig/AutoTest/stdout 001
Log:
Add $message_exim_id as a synonym for $message_id, which will now be
deprecated (it got confused with the Message-ID: header).
Revision Changes Path
1.186 +4 -0 exim/exim-doc/doc-txt/ChangeLog
1.58 +3 -0 exim/exim-doc/doc-txt/NewStuff
1.38 +1 -0 exim/exim-src/src/expand.c
1.31 +1 -1 exim/exim-src/src/globals.c
1.14 +1 -1 exim/exim-test-orig/AutoTest/stdout/001
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- ChangeLog 1 Aug 2005 13:51:05 -0000 1.185
+++ ChangeLog 1 Aug 2005 14:00:34 -0000 1.186
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.185 2005/08/01 13:51:05 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.186 2005/08/01 14:00:34 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -16,6 +16,10 @@
PH/03 When creating an mbox file for a virus/spam scan, use fseek() instead of
fread() to skip over the body file's header line, because in Cygwin the
header line is locked and is inaccessible.
+
+PH/04 Added $message_exim_id, ultimately to replace $message_id (they will both
+ co-exist for some time) to make it clear that it is the Exim ID that is
+ referenced, not the Message-ID: header line.
Exim version 4.52
Index: NewStuff
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- NewStuff 1 Aug 2005 13:20:28 -0000 1.57
+++ NewStuff 1 Aug 2005 14:00:34 -0000 1.58
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.57 2005/08/01 13:20:28 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.58 2005/08/01 14:00:34 ph10 Exp $
New Features in Exim
--------------------
@@ -46,6 +46,9 @@
obtain SQLite support, and you will also need to add -lsqlite3 to the
EXTRALIBS setting. And of course, you have to install SQLite on your
host first.
+
+PH/02 The variable $message_id is now deprecated, to be replaced by
+ $message_exim_id, which makes it clearer which ID is being referenced.
Exim version 4.52
Index: expand.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/expand.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- expand.c 1 Aug 2005 13:20:28 -0000 1.37
+++ expand.c 1 Aug 2005 14:00:35 -0000 1.38
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/expand.c,v 1.37 2005/08/01 13:20:28 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/expand.c,v 1.38 2005/08/01 14:00:35 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -399,6 +399,7 @@
{ "message_body", vtype_msgbody, &message_body },
{ "message_body_end", vtype_msgbody_end, &message_body_end },
{ "message_body_size", vtype_int, &message_body_size },
+ { "message_exim_id", vtype_stringptr, &message_id },
{ "message_headers", vtype_msgheaders, NULL },
{ "message_id", vtype_stringptr, &message_id },
{ "message_linecount", vtype_int, &message_linecount },
Index: globals.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- globals.c 21 Jun 2005 14:14:55 -0000 1.30
+++ globals.c 1 Aug 2005 14:00:35 -0000 1.31
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.c,v 1.30 2005/06/21 14:14:55 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/globals.c,v 1.31 2005/08/01 14:00:35 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -821,7 +821,7 @@
"${if def:tls_cipher {($tls_cipher)\n\t}}"
#endif
"(Exim $version_number)\n\t"
- "id $message_id"
+ "id $message_exim_id"
"${if def:received_for {\n\tfor $received_for}}"
"\0<---------------Space to patch received_header_text->";
Index: 001
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/001,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- 001 21 Jun 2005 14:14:56 -0000 1.13
+++ 001 1 Aug 2005 14:00:35 -0000 1.14
@@ -130,7 +130,7 @@
queue_run_max = 5
queue_smtp_domains =
receive_timeout = 0s
-received_header_text = Received: ${if def:sender_rcvhost {from $sender_rcvhost\n\t}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)\n\t}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)\n\t}}(Exim $version_number)\n\tid $message_id${if def:received_for {\n\tfor $received_for}}
+received_header_text = Received: ${if def:sender_rcvhost {from $sender_rcvhost\n\t}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)\n\t}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)\n\t}}(Exim $version_number)\n\tid $message_exim_id${if def:received_for {\n\tfor $received_for}}
received_headers_max = 30
recipient_unqualified_hosts =
recipients_max = 0
