BUG/MINOR: sample: Make the `word` converter compatible with `-m found`

Previously an expression like:

    path,word(2,/) -m found

always returned `true`.

Bug exists since the `word` converter exists. That is:
c9a0f6d023

The same bug was previously fixed for the `field` converter in commit
4381d26edc.

The fix should be backported to 1.6+.
This commit is contained in:
Tim Duesterhus 2023-11-30 16:41:17 +01:00 committed by Willy Tarreau
parent 8f8349fbef
commit 1dcc6a8a96
2 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,43 @@
varnishtest "word converter Test"
feature ignore_unknown_macro
server s1 {
rxreq
txresp -hdr "Connection: close"
} -repeat 3 -start
haproxy h1 -conf {
defaults
mode http
timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
frontend fe
bind "fd@${fe}"
#### requests
http-request set-var(txn.uri) path
http-response set-header Found %[var(txn.uri),word(2,/)] if { var(txn.uri),word(2,/) -m found }
default_backend be
backend be
server s1 ${s1_addr}:${s1_port}
} -start
client c1 -connect ${h1_fe_sock} {
txreq -url "/foo/bar/baz"
rxresp
expect resp.status == 200
expect resp.http.found == "bar"
txreq -url "/foo//bar/baz"
rxresp
expect resp.status == 200
expect resp.http.found == "bar"
txreq -url "/foo"
rxresp
expect resp.status == 200
expect resp.http.found == "<undef>"
} -run

View File

@ -2964,7 +2964,7 @@ static int sample_conv_word(const struct arg *arg_p, struct sample *smp, void *p
/* Field not found */ /* Field not found */
if (word != arg_p[0].data.sint) { if (word != arg_p[0].data.sint) {
smp->data.u.str.data = 0; smp->data.u.str.data = 0;
return 1; return 0;
} }
found: found:
smp->data.u.str.data = end - start; smp->data.u.str.data = end - start;