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

BUG/MEDIUM: sample: urlp can't match an empty value

Browse Source 
Currently urlp fetching samples were able to find parameters with an empty
value, but the return code depended on the value length. The final result was
that acls using urlp couldn't match empty values.

Example of acl which always returned "false":
  acl MATCH_EMPTY urlp(foo) -m len 0

The fix consists in unconditionally return 1 when the parameter is found.

This fix must be backported to 1.6 and 1.5.
This commit is contained in:
Cyril Bont 2015-11-26 21:39:56 +01:00 committed by Willy Tarreau
parent a1c2b2c4f3
commit ce1ef4df01
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/proto_http.c
View File

@ -11578,10 +11578,11 @@ find_url_param_pos(const char **chunks,
}
/*
* Given a url parameter name and a query string, returns its value and size
* into *value and *value_l respectively, and returns non-zero. An empty
* url_param_name matches the first available parameter. If the parameter is
* not found, zero is returned and value/value_l are not touched.
* Given a url parameter name and a query string, find the next value.
* An empty url_param_name matches the first available parameter.
* If the parameter is found, 1 is returned and *vstart / *vend are updated to
* respectively provide a pointer to the value and its end.
* Otherwise, 0 is returned and vstart/vend are not modified.
*/
static int
find_next_url_param(const char **chunks,
@ -11660,7 +11661,7 @@ find_next_url_param(const char **chunks,
*vstart = value_start;
*vend = value_end;
return value_end != value_start;
return 1;
}
/* This scans a URL-encoded query string. It takes an optionally wrapping