RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-23 13:17:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: http_fecth: Implement body_len and body_size sample fetches for the HTX

Browse Source 
HTX implementation for these 2 sample fetches was missing. This patch fills this
gap.
This commit is contained in:
Christopher Faulet 2018-12-12 14:11:22 +01:00 committed by Willy Tarreau
parent f0216dae0c
commit c16317d1ca
1 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/http_fetch.c
View File

@ -917,7 +917,28 @@ static int smp_fetch_body_len(const struct arg *args, struct sample *smp, const
{ {
if (IS_HTX_SMP(smp) || (smp->px->mode == PR_MODE_TCP)) { if (IS_HTX_SMP(smp) || (smp->px->mode == PR_MODE_TCP)) {
/* HTX version */ /* HTX version */
return 0; /* TODO: to be implemented */ struct htx *htx = smp_prefetch_htx(smp, args);
struct htx_blk *blk;
unsigned long long len = 0;
if (!htx)
return 0;
len = htx->data;
/* Remove the length of headers part */
blk = htx_get_head_blk(htx);
while (blk) {
len -= htx_get_blksz(blk);
if (htx_get_blk_type(blk) == HTX_BLK_EOH)
break;
blk = htx_get_next_blk(htx, blk);
}
smp->data.type = SMP_T_SINT;
smp->data.u.sint = len;
smp->flags = SMP_F_VOL_TEST;
} }
else { else {
/* LEGACY version */ /* LEGACY version */
@ -947,7 +968,30 @@ static int smp_fetch_body_size(const struct arg *args, struct sample *smp, const
{ {
if (IS_HTX_SMP(smp) || (smp->px->mode == PR_MODE_TCP)) { if (IS_HTX_SMP(smp) || (smp->px->mode == PR_MODE_TCP)) {
/* HTX version */ /* HTX version */
return 0; /* TODO: to be implemented */ struct htx *htx = smp_prefetch_htx(smp, args);
struct htx_blk *blk;
unsigned long long len = 0;
if (!htx)
return 0;
len = htx->data;
/* Remove the length of headers part */
blk = htx_get_head_blk(htx);
while (blk) {
len -= htx_get_blksz(blk);
if (htx_get_blk_type(blk) == HTX_BLK_EOH)
break;
blk = htx_get_next_blk(htx, blk);
}
if (htx->extra != ULLONG_MAX)
len += htx->extra;
smp->data.type = SMP_T_SINT;
smp->data.u.sint = len;
smp->flags = SMP_F_VOL_TEST;
} }
else { else {
/* LEGACY version */ /* LEGACY version */