ph10 2005/12/12 11:02:44 GMT
Modified files:
exim-doc/doc-txt ChangeLog NewStuff
exim-src/src expand.c
Log:
Change $reply_address to use raw headers, to retain syntactic validity
in created To: lines.
Revision Changes Path
1.272 +7 -0 exim/exim-doc/doc-txt/ChangeLog
1.79 +4 -4 exim/exim-doc/doc-txt/NewStuff
1.49 +8 -2 exim/exim-src/src/expand.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- ChangeLog 6 Dec 2005 10:25:59 -0000 1.271
+++ ChangeLog 12 Dec 2005 11:02:44 -0000 1.272
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.271 2005/12/06 10:25:59 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.272 2005/12/12 11:02:44 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -18,6 +18,13 @@
[ipv6:....] because it didn't know about the "ipv6:" prefix.
PH/03 Added disable_ipv6.
+
+PH/04 Changed $reply_address to use the raw form of the headers instead of the
+ decoded form, because it is most often used to construct To: headers
+ lines in autoreplies, and the decoded form may well be syntactically
+ invalid. However, $reply_address has leading white space removed, and all
+ newlines turned into spaces so that the autoreply transport does not
+ grumble.
Exim version 4.60
Index: NewStuff
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- NewStuff 6 Dec 2005 10:25:59 -0000 1.78
+++ NewStuff 12 Dec 2005 11:02:44 -0000 1.79
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.78 2005/12/06 10:25:59 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.79 2005/12/12 11:02:44 ph10 Exp $
New Features in Exim
--------------------
@@ -13,10 +13,10 @@
PH/01 There is a new global option called disable_ipv6, which does exactly what
its name implies. If set true, even if the Exim binary has IPv6 support,
- no IPv6 activities take place. AAAA records are never looked up as a for
- host names given in manual routing data or elsewhere. AAAA records that
- are received from the DNS as additional data for MX records are ignored.
- Any IPv6 addresses that are listed in local_interfaces, manualroute route
+ no IPv6 activities take place. AAAA records are never looked up for host
+ names given in manual routing data or elsewhere. AAAA records that are
+ received from the DNS as additional data for MX records are ignored. Any
+ IPv6 addresses that are listed in local_interfaces, manualroute route
data, etc. are also ignored. If IP literals are enabled, the ipliteral
router declines to handle IPv6 literal addresses.
Index: expand.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/expand.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- expand.c 6 Dec 2005 10:25:59 -0000 1.48
+++ expand.c 12 Dec 2005 11:02:44 -0000 1.49
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/expand.c,v 1.48 2005/12/06 10:25:59 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/expand.c,v 1.49 2005/12/12 11:02:44 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -1426,12 +1426,18 @@
return tod_stamp(tod_log_datestamp);
case vtype_reply: /* Get reply address */
- s = find_header(US"reply-to:", exists_only, newsize, FALSE,
+ s = find_header(US"reply-to:", exists_only, newsize, TRUE,
headers_charset);
if (s == NULL || *s == 0)
{
*newsize = 0; /* For the *s==0 case */
- s = find_header(US"from:", exists_only, newsize, FALSE, headers_charset);
+ s = find_header(US"from:", exists_only, newsize, TRUE, headers_charset);
+ }
+ if (s != NULL)
+ {
+ uschar *t;
+ while (isspace(*s)) s++;
+ for (t = s; *t != 0; t++) if (*t == '\n') *t = ' ';
}
return (s == NULL)? US"" : s;
