gamzinav/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLEANUP: http_ana: Make use of the return value of stream_generate_unique_id()

Browse Source 
Even if `unique_id` and `s->unique_id` are identical it is a bit odd to
`isttest()` `unique_id` and then use `s->unique_id` in the call to `http_add_header()`.

This "issue" was introduced in a17e66289c08a5bfadc1bb5b5f2c618c9299fe1b,
because before that commit the function returned the length of the ID, as it
was not an ist.
This commit is contained in:
Tim Duesterhus 2022-05-18 00:22:15 +02:00 committed by Willy Tarreau
parent ccc0355c41
commit 7ad27d41b4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http_ana.c
View File

@ -653,7 +653,7 @@ int http_process_request(struct stream *s, struct channel *req, int an_bit)
/* send unique ID if a "unique-id-header" is defined */
if (isttest(sess->fe->header_unique_id) &&
unlikely(!http_add_header(htx, sess->fe->header_unique_id, s->unique_id)))
unlikely(!http_add_header(htx, sess->fe->header_unique_id, unique_id)))
goto return_int_err;
}

2
src/stream.c
View File

@ -2850,7 +2850,7 @@ INITCALL0(STG_INIT, init_stream);
/* Generates a unique ID based on the given <format>, stores it in the given <strm> and
* returns the unique ID.
*
* If this function fails to allocate memory IST_NULL is returned.
*
* If an ID is already stored within the stream nothing happens existing unique ID is