mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-12 18:16:58 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Pieter Baauw 2016-02-13 16:27:35 +01:00 committed by Willy Tarreau
parent 46af170e41
commit 5e0964ed01
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/checks.c
View File

@ -3249,12 +3249,12 @@ static int enqueue_one_email_alert(struct email_alertq *q, const char *msg)
struct tm tm; struct tm tm;
char datestr[48]; char datestr[48];
const char * const strs[18] = { const char * const strs[18] = {
"From: ", p->email_alert.from, "\n", "From: ", p->email_alert.from, "\r\n",
"To: ", p->email_alert.to, "\n", "To: ", p->email_alert.to, "\r\n",
"Date: ", datestr, "\n", "Date: ", datestr, "\r\n",
"Subject: [HAproxy Alert] ", msg, "\n", "Subject: [HAproxy Alert] ", msg, "\r\n",
"\n", "\r\n",
msg, "\n", msg, "\r\n",
"\r\n", "\r\n",
".\r\n", ".\r\n",
NULL NULL