mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 05:41:26 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: httpclient: must manipulate head, not first

Browse Source 
The httpclient mistakenly use the htx_get_first{_blk}() functions instead
of the htx_get_head{_blk}() functions. Which could stop the httpclient
because it will be without the start line, waiting for data that won't never
come.

Must be backported in 2.5.
This commit is contained in:
William Lallemand 2022-03-10 17:23:40 +01:00
parent c020b2505d
commit 97f69c6fb5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/http_client.c
View File

@ -740,7 +740,7 @@ static void httpclient_applet_io_handler(struct appctx *appctx)
htx = htxbuf(&res->buf); htx = htxbuf(&res->buf);
if (!htx) if (!htx)
goto more; goto more;
blk = htx_get_first_blk(htx); blk = htx_get_head_blk(htx);
if (blk && (htx_get_blk_type(blk) == HTX_BLK_RES_SL)) if (blk && (htx_get_blk_type(blk) == HTX_BLK_RES_SL))
sl = htx_get_blk_ptr(htx, blk); sl = htx_get_blk_ptr(htx, blk);
if (!sl || (!(sl->flags & HTX_SL_F_IS_RESP))) if (!sl || (!(sl->flags & HTX_SL_F_IS_RESP)))
@ -782,7 +782,7 @@ static void httpclient_applet_io_handler(struct appctx *appctx)
hdr_num = 0; hdr_num = 0;
for (pos = htx_get_first(htx); pos != -1; pos = htx_get_next(htx, pos)) { for (pos = htx_get_head(htx); pos != -1; pos = htx_get_next(htx, pos)) {
struct htx_blk *blk = htx_get_blk(htx, pos); struct htx_blk *blk = htx_get_blk(htx, pos);
enum htx_blk_type type = htx_get_blk_type(blk); enum htx_blk_type type = htx_get_blk_type(blk);
uint32_t sz = htx_get_blksz(blk); uint32_t sz = htx_get_blksz(blk);
@ -853,7 +853,7 @@ static void httpclient_applet_io_handler(struct appctx *appctx)
goto process_data; goto process_data;
/* decapsule the htx data to raw data */ /* decapsule the htx data to raw data */
for (pos = htx_get_first(htx); pos != -1; pos = htx_get_next(htx, pos)) { for (pos = htx_get_head(htx); pos != -1; pos = htx_get_next(htx, pos)) {
struct htx_blk *blk = htx_get_blk(htx, pos); struct htx_blk *blk = htx_get_blk(htx, pos);
enum htx_blk_type type = htx_get_blk_type(blk); enum htx_blk_type type = htx_get_blk_type(blk);
size_t count = co_data(res); size_t count = co_data(res);