upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-21 14:17:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

MINOR: http-htx: Handle an optional reason when replacing the response status

Browse source 
When calling the http_replace_res_status() function, an optional reason may now
be set. It is ignored if it points to NULL and the original reason is
preserved. Only the response status is replaced. Otherwise both the status and
the reason are replaced.

It simplifies the API and most of time, avoids an extra call to
http_replace_res_reason().
This commit is contained in:
Christopher Faulet 2020-08-31 16:43:34 +02:00
parent 4b9c0d1fc0
commit bde2c4c621
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/haproxy/http_htx.h
View file

@ -47,7 +47,7 @@ int http_replace_req_meth(struct htx *htx, const struct ist meth);
int http_replace_req_uri(struct htx *htx, const struct ist uri);
int http_replace_req_path(struct htx *htx, const struct ist path, int with_qs);
int http_replace_req_query(struct htx *htx, const struct ist query);
int http_replace_res_status(struct htx *htx, const struct ist status);
int http_replace_res_status(struct htx *htx, const struct ist status, const struct ist reason);
int http_replace_res_reason(struct htx *htx, const struct ist reason);
int http_replace_header_value(struct htx *htx, struct http_hdr_ctx *ctx, const struct ist data);
int http_replace_header(struct htx *htx, struct http_hdr_ctx *ctx, const struct ist name, const struct ist value);

4
src/http_ana.c
View file

@ -2815,9 +2815,7 @@ int http_res_set_status(unsigned int status, struct ist reason, struct stream *s
reason = ist2(str, strlen(str));
}
if (!http_replace_res_status(htx, ist2(trash.area, trash.data)))
return -1;
if (!http_replace_res_reason(htx, reason))
if (!http_replace_res_status(htx, ist2(trash.area, trash.data), reason))
return -1;
return 0;
}

14
src/http_htx.c
View file

@ -487,11 +487,11 @@ int http_replace_req_query(struct htx *htx, const struct ist query)
/* Replace the response status in the HTX message <htx> by <status>. It returns
* 1 on success, otherwise 0.
*/
int http_replace_res_status(struct htx *htx, const struct ist status)
int http_replace_res_status(struct htx *htx, const struct ist status, const struct ist reason)
{
struct buffer *temp = get_trash_chunk();
struct htx_sl *sl = http_get_stline(htx);
struct ist vsn, reason;
struct ist vsn, r;
if (!sl)
return 0;
@ -499,13 +499,15 @@ int http_replace_res_status(struct htx *htx, const struct ist status)
/* Start by copying old uri and version */
chunk_memcat(temp, HTX_SL_RES_VPTR(sl), HTX_SL_RES_VLEN(sl)); /* vsn */
vsn = ist2(temp->area, HTX_SL_RES_VLEN(sl));
chunk_memcat(temp, HTX_SL_RES_RPTR(sl), HTX_SL_RES_RLEN(sl)); /* reason */
reason = ist2(temp->area + vsn.len, HTX_SL_RES_RLEN(sl));
r = reason;
if (!isttest(r)) {
chunk_memcat(temp, HTX_SL_RES_RPTR(sl), HTX_SL_RES_RLEN(sl)); /* reason */
r = ist2(temp->area + vsn.len, HTX_SL_RES_RLEN(sl));
}
/* create the new start line */
sl->info.res.status = strl2ui(status.ptr, status.len);
return http_replace_stline(htx, vsn, status, reason);
return http_replace_stline(htx, vsn, status, r);
}
/* Replace the response reason in the HTX message <htx> by <reason>. It returns