ph10 2006/10/03 09:54:50 BST
Modified files:
exim-doc/doc-txt ChangeLog NewStuff
exim-src/src expand.c
exim-test/confs 0006
exim-test/mail 0006.CALLER
exim-test/scripts/0000-Basic 0006
Log:
Added $message_headers_raw to give all the headers without RFC 2047
decoding.
Revision Changes Path
1.401 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.114 +4 -0 exim/exim-doc/doc-txt/NewStuff
1.63 +8 -2 exim/exim-src/src/expand.c
1.2 +2 -1 exim/exim-test/confs/0006
1.2 +13 -0 exim/exim-test/mail/0006.CALLER
1.2 +2 -1 exim/exim-test/scripts/0000-Basic/0006
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- ChangeLog 2 Oct 2006 13:38:17 -0000 1.400
+++ ChangeLog 3 Oct 2006 08:54:50 -0000 1.401
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.400 2006/10/02 13:38:17 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.401 2006/10/03 08:54:50 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -78,6 +78,9 @@
service in request". It would seem that Dovecot has changed its
interface. Fortunately there's a specification; I followed it and
changed what the client sends and it appears to be working now.
+
+PH/13 Added $message_headers_raw to provide the headers without RFC 2047
+ decoding.
Exim version 4.63
Index: NewStuff
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- NewStuff 2 Oct 2006 14:30:29 -0000 1.113
+++ NewStuff 3 Oct 2006 08:54:50 -0000 1.114
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.113 2006/10/02 14:30:29 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.114 2006/10/03 08:54:50 ph10 Exp $
New Features in Exim
--------------------
@@ -71,6 +71,10 @@
public_name = NTLM
server_name = /var/run/dovecot/auth-client
server_setid = $auth1
+
+4. The variable $message_headers_raw provides a concatenation of all the
+ messages's headers without any decoding. This is in contrast to
+ $message_headers, which does RFC2047 encoding on the header contents.
Version 4.63
Index: expand.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/expand.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- expand.c 19 Sep 2006 14:31:07 -0000 1.62
+++ expand.c 3 Oct 2006 08:54:50 -0000 1.63
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/expand.c,v 1.62 2006/09/19 14:31:07 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/expand.c,v 1.63 2006/10/03 08:54:50 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -274,7 +274,8 @@
vtype_stringptr, /* value is address of pointer to string */
vtype_msgbody, /* as stringptr, but read when first required */
vtype_msgbody_end, /* ditto, the end of the message */
- vtype_msgheaders, /* the message's headers */
+ vtype_msgheaders, /* the message's headers, processed */
+ vtype_msgheaders_raw, /* the message's headers, unprocessed */
vtype_localpart, /* extract local part from string */
vtype_domain, /* extract domain from string */
vtype_recipients, /* extract recipients from recipients list */
@@ -385,6 +386,7 @@
{ "message_body_size", vtype_int, &message_body_size },
{ "message_exim_id", vtype_stringptr, &message_id },
{ "message_headers", vtype_msgheaders, NULL },
+ { "message_headers_raw", vtype_msgheaders_raw, NULL },
{ "message_id", vtype_stringptr, &message_id },
{ "message_linecount", vtype_int, &message_linecount },
{ "message_size", vtype_int, &message_size },
@@ -1078,7 +1080,8 @@
newsize return the size of memory block that was obtained; may be NULL
if exists_only is TRUE
want_raw TRUE if called for $rh_ or $rheader_ variables; no processing,
- other than concatenating, will be done on the header
+ other than concatenating, will be done on the header. Also used
+ for $message_headers_raw.
charset name of charset to translate MIME words to; used only if
want_raw is false; if NULL, no translation is done (this is
used for $bh_ and $bheader_)
@@ -1384,6 +1387,9 @@
case vtype_msgheaders:
return find_header(NULL, exists_only, newsize, FALSE, NULL);
+
+ case vtype_msgheaders_raw:
+ return find_header(NULL, exists_only, newsize, TRUE, NULL);
case vtype_msgbody: /* Pointer to msgbody string */
case vtype_msgbody_end: /* Ditto, the end of the msg */
Index: 0006
===================================================================
RCS file: /home/cvs/exim/exim-test/confs/0006,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0006 7 Feb 2006 10:34:25 -0000 1.1
+++ 0006 3 Oct 2006 08:54:50 -0000 1.2
@@ -41,7 +41,8 @@
envelope_to_add
file = DIR/test-mail/$local_part
return_path_add
- headers_add = \nMessage Headers:\n$message_headers\n
+ headers_add = \nMessage Headers:\n$message_headers\n\
+ \nRaw Message Headers:\n$message_headers_raw\n
address_file:
driver = appendfile
Index: 0006.CALLER
===================================================================
RCS file: /home/cvs/exim/exim-test/mail/0006.CALLER,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0006.CALLER 7 Feb 2006 10:34:59 -0000 1.1
+++ 0006.CALLER 3 Oct 2006 08:54:50 -0000 1.2
@@ -7,6 +7,7 @@
id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
From:<someone@???>
To: Recipients not given:;
+X-Test: (=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=)
Message-Id: <E10HmaZ-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -16,8 +17,20 @@
id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
From:<someone@???>
To: Recipients not given:;
+X-Test: (íåìù ïá éìèôð)
Message-Id: <E10HmaZ-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Raw Message Headers:
+Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
+ (envelope-from <someone@???>)
+ id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+From:<someone@???>
+To: Recipients not given:;
+X-Test: (=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=)
+Message-Id: <E10HmaZ-0005vi-00@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
Yet more text.
Index: 0006
===================================================================
RCS file: /home/cvs/exim/exim-test/scripts/0000-Basic/0006,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0006 7 Feb 2006 10:54:33 -0000 1.1
+++ 0006 3 Oct 2006 08:54:50 -0000 1.2
@@ -1,4 +1,4 @@
-# -bS to several local deliveries
+# -bS to several local deliveries and $message_headers[_raw]
exim -bS -odi
mail from:someone@???
rcpt to:blackhole@HOSTNAME
@@ -22,6 +22,7 @@
DATA
From:<someone@???>
To: Recipients not given:;
+X-Test: (=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=)
Yet more text.
.
