mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: logs: fix trailing zeros on log message.

Browse Source 
This patch removes all trailing LFs and Zeros from
log messages. Previously only the last LF was removed.

It's a regression from e8ea0ae6f6 "BUG/MINOR: logs:
prevent double line returns in some events."

This should fix github issue #654
This commit is contained in:
Emeric Brun 2020-05-28 14:21:33 +02:00 committed by Willy Tarreau
parent 31a841c323
commit fa9d780119
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/log.c
View File

@ -1579,8 +1579,10 @@ static inline void __do_send_log(struct logsrv *logsrv, int nblogger, char *pid_
dataptr = message;
/* historically some messages used to already contain the trailing LF */
if (size && (dataptr[size-1] == '\n'))
/* historically some messages used to already contain the trailing LF
* or Zero. Let's remove all trailing LF or Zero
*/
while (size && ((dataptr[size-1] == '\n' || (dataptr[size-1] == 0))))
size--;
if (logsrv->type == LOG_TARGET_FD) {