MINOR: htx: Replace the function http_find_stline() by http_get_stline()
Now, we only return the start-line. If not found, NULL is returned. No lookup is
performed and the HTX message is no more updated. It is now the caller
responsibility to update the position of the start-line to the right value. So
when it is not found, i.e sl_pos is set to -1, it means the last start-line has
been already processed and the next one has not been inserted yet.
It is mandatory to rely on this kind of warranty to store 1xx informational
responses and final reponse in the same HTX message.
diff --git a/src/http_fetch.c b/src/http_fetch.c
index e16d7bf..0a5a2f9 100644
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -209,7 +209,7 @@
return NULL;
}
}
- sl = http_find_stline(htx);
+ sl = http_get_stline(htx);
if (vol && !sl) {
/* The start-line was already forwarded, it is too late to fetch anything */
return NULL;
@@ -434,7 +434,7 @@
/* ensure the indexes are not affected */
return 0;
}
- sl = http_find_stline(htx);
+ sl = http_get_stline(htx);
smp->flags |= SMP_F_CONST;
smp->data.u.meth.str.area = HTX_SL_REQ_MPTR(sl);
smp->data.u.meth.str.data = HTX_SL_REQ_MLEN(sl);
@@ -478,7 +478,7 @@
if (!htx)
return 0;
- sl = http_find_stline(htx);
+ sl = http_get_stline(htx);
len = HTX_SL_REQ_VLEN(sl);
ptr = HTX_SL_REQ_VPTR(sl);
}
@@ -518,7 +518,7 @@
if (!htx)
return 0;
- sl = http_find_stline(htx);
+ sl = http_get_stline(htx);
len = HTX_SL_RES_VLEN(sl);
ptr = HTX_SL_RES_VPTR(sl);
}
@@ -559,7 +559,7 @@
if (!htx)
return 0;
- sl = http_find_stline(htx);
+ sl = http_get_stline(htx);
len = HTX_SL_RES_CLEN(sl);
ptr = HTX_SL_RES_CPTR(sl);
}
@@ -1009,7 +1009,7 @@
if (!htx)
return 0;
- sl = http_find_stline(htx);
+ sl = http_get_stline(htx);
smp->data.type = SMP_T_STR;
smp->data.u.str.area = HTX_SL_REQ_UPTR(sl);
smp->data.u.str.data = HTX_SL_REQ_ULEN(sl);
@@ -1041,7 +1041,7 @@
if (!htx)
return 0;
- sl = http_find_stline(htx);
+ sl = http_get_stline(htx);
url2sa(HTX_SL_REQ_UPTR(sl), HTX_SL_REQ_ULEN(sl), &addr, NULL);
}
else {
@@ -1074,7 +1074,7 @@
if (!htx)
return 0;
- sl = http_find_stline(htx);
+ sl = http_get_stline(htx);
url2sa(HTX_SL_REQ_UPTR(sl), HTX_SL_REQ_ULEN(sl), &addr, NULL);
}
else {
@@ -1573,7 +1573,7 @@
if (!htx)
return 0;
- sl = http_find_stline(htx);
+ sl = http_get_stline(htx);
path = http_get_path(htx_sl_req_uri(sl));
if (!path.ptr)
return 0;
@@ -1643,7 +1643,7 @@
chunk_memcat(temp, ctx.value.ptr, ctx.value.len);
/* now retrieve the path */
- sl = http_find_stline(htx);
+ sl = http_get_stline(htx);
path = http_get_path(htx_sl_req_uri(sl));
if (path.ptr) {
size_t len;
@@ -1728,7 +1728,7 @@
}
/* now retrieve the path */
- sl = http_find_stline(htx);
+ sl = http_get_stline(htx);
path = http_get_path(htx_sl_req_uri(sl));
if (path.ptr) {
size_t len;
@@ -1844,7 +1844,7 @@
if (!htx)
return 0;
- sl = http_find_stline(htx);
+ sl = http_get_stline(htx);
ptr = HTX_SL_REQ_UPTR(sl);
end = HTX_SL_REQ_UPTR(sl) + HTX_SL_REQ_ULEN(sl);
}
@@ -2523,7 +2523,7 @@
if (!htx)
return 0;
- sl = http_find_stline(htx);
+ sl = http_get_stline(htx);
smp->ctx.a[0] = http_find_param_list(HTX_SL_REQ_UPTR(sl), HTX_SL_REQ_ULEN(sl), delim);
if (!smp->ctx.a[0])
return 0;
@@ -2701,7 +2701,7 @@
}
/* now retrieve the path */
- sl = http_find_stline(htx);
+ sl = http_get_stline(htx);
path = http_get_path(htx_sl_req_uri(sl));
while (path.len > 0 && *(path.ptr) != '?') {
path.ptr++;