Gitweb:
http://git.exim.org/exim.git/commitdiff/6eb02f881ddd9af83d697244ec35704c8dfbe9a8
Commit: 6eb02f881ddd9af83d697244ec35704c8dfbe9a8
Parent: d502442ac32f8964f6cf86469869cecb035d12c0
Author: Todd Lyons <tlyons@???>
AuthorDate: Wed May 28 08:48:45 2014 -0700
Committer: Todd Lyons <tlyons@???>
CommitDate: Wed May 28 08:48:45 2014 -0700
Bug 1444: Fix \r\n handling writing spool file
Fix a bug which causes DKIM signatures to fail because what gets
written to the spool file is different than what gets passed through
the DKIM code.
---
doc/doc-txt/ChangeLog | 3 +++
src/src/receive.c | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index ee56623..a1ef019 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -123,6 +123,9 @@ TL/11 Bug 1119: fix memory allocation in string_printing2(). Patch from
JH/24 The OCSP stapling feature is moved from Experimental into the mainline.
+TL/12 Bug 1444: Fix improper \r\n sequence handling when writing spool
+ file. Patch from Wolfgang Breyha.
+
Exim version 4.82
-----------------
diff --git a/src/src/receive.c b/src/src/receive.c
index ea957c7..ac3f0cf 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -684,6 +684,7 @@ while ((ch = (receive_getc)()) != EOF)
case 1: /* After written "\n" */
if (ch == '.') { ch_state = 3; continue; }
+ if (ch == '\r') { ch_state = 2; continue; }
if (ch != '\n') ch_state = 0; else linelength = -1;
break;