Leading white space used to be stripped from $spam_report which

wrecked the formatting. Now it is preserved.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 29bb9a5e37bd5f4c1ba647d3059c579511f75c43..9ca31ea08df5dae9100f221eaf31499997683814 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.548 2008/05/16 12:22:08 nm4 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.549 2008/07/18 17:55:42 fanf2 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -54,7 +54,8 @@ NM/05 Bugzilla 437: Prevent Maildix aux files being created with mode 000
 NM/05 Bugzilla 598: Improvedment to Dovecot authenticator handling.
       Patch provided by Jan Srzednicki
 
 NM/05 Bugzilla 598: Improvedment to Dovecot authenticator handling.
       Patch provided by Jan Srzednicki
 

-
+TF/05 Leading white space used to be stripped from $spam_report which
+      wrecked the formatting. Now it is preserved.

 
 
 Exim version 4.69
 
 
 Exim version 4.69

diff --git a/src/src/spam.c b/src/src/spam.c
index 4b480fd496795b288174b7f33cfbac25007388c1..beec82363a16f7852b2d3a1db5614d0365ef63ab 100644 (file)
--- a/src/src/spam.c
+++ b/src/src/spam.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/spam.c,v 1.16 2008/01/28 13:14:48 tom Exp $ */
+/* $Cambridge: exim/src/src/spam.c,v 1.17 2008/07/18 17:55:42 fanf2 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -354,13 +354,10 @@ again:
     *q = *p;
     q++;
     if (*p == '\n') {
     *q = *p;
     q++;
     if (*p == '\n') {

-      *q = '\t';
+      /* add an extra space after the newline to ensure
+      that it is treated as a header continuation line */
+      *q = ' ';

       q++;
       q++;

-      /* eat whitespace */
-      while( (*p <= ' ') && (*p != '\0') ) {
-        p++;
-      };
-      p--;

     };
     p++;
   };
     };
     p++;
   };