RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-14 07:24:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: httpclient: enable request buffering

Browse Source 
The request buffering is required for doing l7 retry. The IO handler of
the httpclient need to be rework for that.

This patch change the IO handler so it copies partially the data instead
of swapping buffer. This is needed because the b_xfer won't never work
if the destination buffer is not empty, which is the case when
buffering.
This commit is contained in:
William Lallemand 2022-03-18 17:57:15 +01:00
parent e8041fe8bc
commit ccc7ee45f9
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/http_client.c
View File

@ -690,31 +690,42 @@ static void httpclient_applet_io_handler(struct appctx *appctx)
/* call the payload callback */
{
if (hc->ops.req_payload) {
struct htx *hc_htx;
/* call the request callback */
hc->ops.req_payload(hc);
/* check if the request buffer is empty */
hc_htx = htx_from_buf(&hc->req.buf);
htx = htx_from_buf(&req->buf);
if (!htx_is_empty(htx))
goto more;
/* Here htx_to_buf() will set buffer data to 0 because
* the HTX is empty, and allow us to do an xfer.
*/
htx_to_buf(htx, &req->buf);
ret = b_xfer(&req->buf, &hc->req.buf, b_data(&hc->req.buf));
if (!ret)
if (htx_is_empty(hc_htx))
goto more;
if (htx_is_empty(htx)) {
/* Here htx_to_buf() will set buffer data to 0 because
* the HTX is empty, and allow us to do an xfer.
*/
htx_to_buf(hc_htx, &hc->req.buf);
htx_to_buf(htx, &req->buf);
channel_add_input(req, hc_htx->data);
b_xfer(&req->buf, &hc->req.buf, b_data(&hc->req.buf));
} else {
struct htx_ret ret;
ret = htx_xfer_blks(htx, hc_htx, hc_htx->data, HTX_BLK_UNUSED);
channel_add_input(req, ret.ret);
/* we must copy the EOM if we empty the buffer */
if (htx_is_empty(hc_htx)) {
htx->flags |= (hc_htx->flags & HTX_FL_EOM);
}
htx_to_buf(htx, &req->buf);
htx_to_buf(hc_htx, &hc->req.buf);
}
if (!b_data(&hc->req.buf))
b_free(&hc->req.buf);
htx = htx_from_buf(&req->buf);
if (!htx)
goto more;
channel_add_input(req, htx->data);
}
htx = htx_from_buf(&req->buf);
@ -987,6 +998,7 @@ static int httpclient_init()
proxy_preset_defaults(httpclient_proxy);
httpclient_proxy->options |= PR_O_WREQ_BODY;
httpclient_proxy->options2 |= PR_O2_INDEPSTR;
httpclient_proxy->mode = PR_MODE_HTTP;
httpclient_proxy->maxconn = 0;