ph10 2005/03/22 16:44:04 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src transport.c
Log:
Fix missing newline in debug output for headers_add in a transport.
Revision Changes Path
1.98 +4 -0 exim/exim-doc/doc-txt/ChangeLog
1.7 +11 -3 exim/exim-src/src/transport.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- ChangeLog 22 Mar 2005 15:45:35 -0000 1.97
+++ ChangeLog 22 Mar 2005 16:44:04 -0000 1.98
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.97 2005/03/22 15:45:35 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.98 2005/03/22 16:44:04 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -70,6 +70,10 @@
PH/12 If the last host in a fallback_hosts list was multihomed, only the first
of its addresses was ever tried. (Bugzilla bug #2.)
+
+PH/13 If "headers_add" in a transport didn't end in a newline, Exim printed
+ the result incorrectly in the debug output. (It correctly added a newline
+ to what was transported.)
A note about Exim versions 4.44 and 4.50
Index: transport.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transport.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- transport.c 8 Mar 2005 16:57:28 -0000 1.6
+++ transport.c 22 Mar 2005 16:44:04 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transport.c,v 1.6 2005/03/08 16:57:28 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/transport.c,v 1.7 2005/03/22 16:44:04 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -797,7 +797,10 @@
same alias might share some of them) but we want to output them in the
opposite order. This is a bit tedious, but there shouldn't be very many
of them. We just walk the list twice, reversing the pointers each time,
- but on the second time, write out the items. */
+ but on the second time, write out the items.
+
+ Headers added to an address by a router are guaranteed to end with a newline.
+ */
if (addr != NULL)
{
@@ -824,7 +827,8 @@
/* If a string containing additional headers exists, expand it and write
out the result. This is done last so that if it (deliberately or accidentally)
isn't in header format, it won't mess up any other headers. An empty string
- or a forced expansion failure are noops. */
+ or a forced expansion failure are noops. An added header string from a
+ transport may not end with a newline; add one if it does not. */
if (add_headers != NULL)
{
@@ -846,7 +850,11 @@
if (s[len-1] != '\n' && !write_chunk(fd, US"\n", 1, use_crlf))
return FALSE;
DEBUG(D_transport)
- debug_printf("added header line(s):\n%s---\n", s);
+ {
+ debug_printf("added header line(s):\n%s", s);
+ if (s[len-1] != '\n') debug_printf("\n");
+ debug_printf("---\n");
+ }
}
}
}
