RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-25 15:03:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: http: http-request add-header emits a corrupted header

Browse Source 
David BERARD reported that http-request add-header passes a \0 along
with the header field, which of course is not appropriate. This is
caused by build_logline() which sometimes returns the size with the
trailing zero and sometimes can return an empty string. Let's fix
this function instead of fixing the places where it's used.
This commit is contained in:
Willy Tarreau 2012-12-28 02:44:01 +01:00
parent 1a1e8072f9
commit df97447088
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/log.c
View File

@ -844,7 +844,11 @@ const char sess_set_cookie[8] = "NPDIRU67"; /* No set-cookie, Set-cookie found a
} while(0)
/* Builds a log line in <dst> based on <list_format>, and stops before reaching
* <maxsize> characters. Returns the size of the output string in characters,
* not counting the trailing zero which is always added if the resulting size
* is not zero.
*/
int build_logline(struct session *s, char *dst, size_t maxsize, struct list *list_format)
{
struct proxy *fe = s->fe;
@ -1474,8 +1478,7 @@ int build_logline(struct session *s, char *dst, size_t maxsize, struct list *lis
out:
/* *tmplog is a unused character */
*tmplog = '\0';
return tmplog - dst + 1;
return tmplog - dst;
}
@ -1507,7 +1510,7 @@ void sess_log(struct session *s)
size = tmplog - logline;
size += build_logline(s, tmplog, sizeof(logline) - size, &s->fe->logformat);
if (size > 0) {
__send_log(s->fe, level, logline, size);
__send_log(s->fe, level, logline, size + 1);
s->logs.logwait = 0;
}
}