From: Pieter Baauw <piba.nl.dev@gmail.com>
Date: Sat, 13 Feb 2016 15:27:35 +0000 (+0100)
Subject: MINOR: mailers: use <CRLF> for all line endings
X-Git-Tag: v1.7-dev2~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e0964ed01a27566183f19a57ac2c3357b39acee;p=thirdparty%2Fhaproxy.git

MINOR: mailers: use <CRLF> for all line endings

Not doing so causes issues with Exchange2013 not processing the message
body from the email. Specification seems to specify that as correct
behavior : https://www.ietf.org/rfc/rfc2821.txt # 2.3.7 Lines

 > SMTP client implementations MUST NOT transmit "bare" "CR" or "LF" characters.

This patch should be backported to 1.6.

Acked-by: Simon Horman <horms@verge.net.au>
---

diff --git a/src/checks.c b/src/checks.c
index 9d6d33e5b5..2cfb01f6a5 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -3249,12 +3249,12 @@ static int enqueue_one_email_alert(struct email_alertq *q, const char *msg)
 		struct tm tm;
 		char datestr[48];
 		const char * const strs[18] = {
-			"From: ", p->email_alert.from, "\n",
-			"To: ", p->email_alert.to, "\n",
-			"Date: ", datestr, "\n",
-			"Subject: [HAproxy Alert] ", msg, "\n",
-			"\n",
-			msg, "\n",
+			"From: ", p->email_alert.from, "\r\n",
+			"To: ", p->email_alert.to, "\r\n",
+			"Date: ", datestr, "\r\n",
+			"Subject: [HAproxy Alert] ", msg, "\r\n",
+			"\r\n",
+			msg, "\r\n",
 			"\r\n",
 			".\r\n",
 			NULL