RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-19 20:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: httpclient: Don't remove HTX header blocks before duplicating them

Browse Source 
Commit 534645d6 ("BUG/MEDIUM: httpclient: Fix loop consuming HTX blocks from
the response channel") introduced a regression. When the response is
consumed, The HTX header blocks are removed before duplicating them. Thus,
the first header block is always lost.

This patch must be backported as far as 2.5.
This commit is contained in:
Christopher Faulet 2022-06-01 16:37:49 +02:00
parent c642d7c131
commit 18de6f2880
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/http_client.c
View File

@ -792,11 +792,8 @@ static void httpclient_applet_io_handler(struct appctx *appctx)
uint32_t sz = htx_get_blksz(blk);
c_rew(res, sz);
blk = htx_remove_blk(htx, blk);
if (type == HTX_BLK_UNUSED)
continue;
else if (type == HTX_BLK_HDR) {
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));
hdr_num++;
@ -805,8 +802,10 @@ static void httpclient_applet_io_handler(struct appctx *appctx)
/* create a NULL end of array and leave the loop */
hdrs[hdr_num].n = IST_NULL;
hdrs[hdr_num].v = IST_NULL;
htx_remove_blk(htx, blk);
break;
}
blk = htx_remove_blk(htx, blk);
}
if (hdr_num) {