RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-19 18:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: sample: use iststop instead of a for loop

Browse Source 
In sample_fetch_path we can use iststop() instead of a for loop
to find the '?' and return the correct length. This requires commit
"MINOR: ist: add an iststop() function".
This commit is contained in:
Jerome Magnin 2020-02-21 10:49:12 +01:00 committed by Willy Tarreau
parent 4bbc9494b7
commit 4fb196c1d6
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/http_fetch.c
View File

@ -982,23 +982,19 @@ static int smp_fetch_path(const struct arg *args, struct sample *smp, const char
struct htx *htx = smp_prefetch_htx(smp, chn, 1);
struct htx_sl *sl;
struct ist path;
size_t len;
if (!htx)
return 0;
sl = http_get_stline(htx);
path = http_get_path(htx_sl_req_uri(sl));
path = iststop(http_get_path(htx_sl_req_uri(sl)), '?');
if (!path.ptr)
return 0;
for (len = 0; len < path.len && *(path.ptr + len) != '?'; len++)
;
/* OK, we got the '/' ! */
smp->data.type = SMP_T_STR;
smp->data.u.str.area = path.ptr;
smp->data.u.str.data = len;
smp->data.u.str.data = path.len;
smp->flags = SMP_F_VOL_1ST | SMP_F_CONST;
return 1;
}