RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-18 11:47:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: httpclient: remove the UNUSED block when parsing headers

Browse Source 
Remove the UNUSED blocks when iterating on headers, we should not stop
when encountering one. We should only stop iterating once we found the
EOH block. It doesn't provoke a problem, since we don't manipulates
the headers before treating them, but it could evolve in the future.

Must be backported to 2.5.
This commit is contained in:
William Lallemand 2022-03-09 18:56:02 +01:00
parent c8f1eb99b4
commit c020b2505d
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/http_client.c
View File

@ -787,24 +787,29 @@ static void httpclient_applet_io_handler(struct appctx *appctx)
enum htx_blk_type type = htx_get_blk_type(blk);
uint32_t sz = htx_get_blksz(blk);
if (type == HTX_BLK_UNUSED) {
c_rew(res, sz);
htx_remove_blk(htx, blk);
}
if (type == HTX_BLK_HDR) {
hdrs[hdr_num].n = istdup(htx_get_blk_name(htx, blk));
hdrs[hdr_num].v = istdup(htx_get_blk_value(htx, blk));
if (!isttest(hdrs[hdr_num].v) || !isttest(hdrs[hdr_num].n))
goto end;
c_rew(res, sz);
htx_remove_blk(htx, blk);
hdr_num++;
}
/* create a NULL end of array and leave the loop */
if (type == HTX_BLK_EOH) {
hdrs[hdr_num].n = IST_NULL;
hdrs[hdr_num].v = IST_NULL;
co_set_data(res, co_data(res) - sz);
c_rew(res, sz);
htx_remove_blk(htx, blk);
break;
}
if (type != HTX_BLK_HDR)
break;
hdrs[hdr_num].n = istdup(htx_get_blk_name(htx, blk));
hdrs[hdr_num].v = istdup(htx_get_blk_value(htx, blk));
if (!isttest(hdrs[hdr_num].v) || !isttest(hdrs[hdr_num].n))
goto end;
co_set_data(res, co_data(res) - sz);
htx_remove_blk(htx, blk);
hdr_num++;
}
if (hdr_num) {