diff options
| author | Todd Lyons <tlyons@exim.org> | 2014-05-28 08:48:45 -0700 |
|---|---|---|
| committer | Todd Lyons <tlyons@exim.org> | 2014-05-28 08:48:45 -0700 |
| commit | 6eb02f881ddd9af83d697244ec35704c8dfbe9a8 (patch) | |
| tree | 2e388fd459e2691ed83ac5efb71bf1f5c95e2059 | |
| parent | d502442ac32f8964f6cf86469869cecb035d12c0 (diff) | |
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.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 3 | ||||
| -rw-r--r-- | 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 ee56623ad..a1ef01912 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 ea957c7cf..ac3f0cf07 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; |