mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-04-05 02:51:44 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: http-client: Test HTX_FL_EOM flag before commiting the HTX buffer

Browse Source 
when htx_to_buf() function is called, if the HTX message is empty, the
buffer is reset. So HTX flags must not be tested after because the info may
be lost.

So now, we take care to test HTX_FL_EOM flag before calling htx_to_buf().

This patch must be backported as far as 2.8.
This commit is contained in:
Christopher Faulet 2025-07-08 08:24:45 +02:00
parent e4a0d40c62
commit 4bdb2e5a26
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/http_client.c
View File

@ -659,8 +659,6 @@ void httpclient_applet_io_handler(struct appctx *appctx)
if (hc->ops.res_stline)
hc->ops.res_stline(hc);
htx_to_buf(htx, &res->buf);
/* if there is no HTX data anymore and the EOM flag is
* set, leave (no body) */
if (htx_is_empty(htx) && htx->flags & HTX_FL_EOM)
@ -668,6 +666,7 @@ void httpclient_applet_io_handler(struct appctx *appctx)
else
appctx->st0 = HTTPCLIENT_S_RES_HDR;
htx_to_buf(htx, &res->buf);
break;
case HTTPCLIENT_S_RES_HDR:
@ -697,7 +696,6 @@ void httpclient_applet_io_handler(struct appctx *appctx)
if (htx->flags & HTX_FL_EOM)
hc_htx->flags |= HTX_FL_EOM;
htx_to_buf(htx, &res->buf);
htx_to_buf(hc_htx, &hc->res.buf);
} else {
@ -730,7 +728,6 @@ void httpclient_applet_io_handler(struct appctx *appctx)
}
blk = htx_remove_blk(htx, blk);
}
htx_to_buf(htx, &res->buf);
if (hdr_num) {
/* alloc and copy the headers in the httpclient struct */
@ -752,6 +749,7 @@ void httpclient_applet_io_handler(struct appctx *appctx)
appctx->st0 = HTTPCLIENT_S_RES_BODY;
}
htx_to_buf(htx, &res->buf);
break;
case HTTPCLIENT_S_RES_BODY:
@ -841,16 +839,16 @@ void httpclient_applet_io_handler(struct appctx *appctx)
}
}
/* if not finished, should be called again */
if ((htx_is_empty(htx) && (htx->flags & HTX_FL_EOM)))
appctx->st0 = HTTPCLIENT_S_RES_END;
htx_to_buf(htx, &res->buf);
/* the data must be processed by the caller in the receive phase */
if (hc->ops.res_payload)
hc->ops.res_payload(hc);
/* if not finished, should be called again */
if ((htx_is_empty(htx) && (htx->flags & HTX_FL_EOM)))
appctx->st0 = HTTPCLIENT_S_RES_END;
/* end of message, we should quit */
break;
case HTTPCLIENT_S_RES_END: