BUG/MINOR: http-fetch: Fix calls w/o parentheses of the cookie sample fetches
req.cook, req.cook_val, req.cook_cnt and and their response counterparts may be
called without cookie name. In this case, empty parentheses may be used, or no
parentheses at all. In both, the result must be the same. But only the first one
works. The second one always returns a failure. This patch fixes this bug.
Note that on old versions (< 2.2), both cases fail.
This patch must be backported in all stable versions.
diff --git a/src/http_fetch.c b/src/http_fetch.c
index 8719a54..595e0e3 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -1580,10 +1580,14 @@
struct htx *htx = smp_prefetch_htx(smp, chn, check, 1);
struct http_hdr_ctx *ctx = smp->ctx.a[2];
struct ist hdr;
+ char *cook = NULL;
+ size_t cook_l = 0;
int found = 0;
- if (!args || args->type != ARGT_STR)
- return 0;
+ if (args && args->type == ARGT_STR) {
+ cook = args->data.str.area;
+ cook_l = args->data.str.data;
+ }
if (!ctx) {
/* first call */
@@ -1617,7 +1621,7 @@
if (!http_find_header(htx, hdr, ctx, 0))
goto out;
- if (ctx->value.len < args->data.str.data + 1)
+ if (ctx->value.len < cook_l + 1)
continue;
smp->ctx.a[0] = ctx->value.ptr;
@@ -1627,7 +1631,7 @@
smp->data.type = SMP_T_STR;
smp->flags |= SMP_F_CONST;
smp->ctx.a[0] = http_extract_cookie_value(smp->ctx.a[0], smp->ctx.a[1],
- args->data.str.area, args->data.str.data,
+ cook, cook_l,
(smp->opt & SMP_OPT_DIR) == SMP_OPT_DIR_REQ,
&smp->data.u.str.area,
&smp->data.u.str.data);
@@ -1678,10 +1682,14 @@
struct http_hdr_ctx ctx;
struct ist hdr;
char *val_beg, *val_end;
+ char *cook = NULL;
+ size_t cook_l = 0;
int cnt;
- if (!args || args->type != ARGT_STR)
- return 0;
+ if (args && args->type == ARGT_STR){
+ cook = args->data.str.area;
+ cook_l = args->data.str.data;
+ }
if (!htx)
return 0;
@@ -1697,7 +1705,7 @@
if (!http_find_header(htx, hdr, &ctx, 0))
break;
- if (ctx.value.len < args->data.str.data + 1)
+ if (ctx.value.len < cook_l + 1)
continue;
val_beg = ctx.value.ptr;
@@ -1707,7 +1715,7 @@
smp->data.type = SMP_T_STR;
smp->flags |= SMP_F_CONST;
while ((val_beg = http_extract_cookie_value(val_beg, val_end,
- args->data.str.area, args->data.str.data,
+ cook, cook_l,
(smp->opt & SMP_OPT_DIR) == SMP_OPT_DIR_REQ,
&smp->data.u.str.area,
&smp->data.u.str.data))) {