From 7ad27d41b483cdad619169fccc713c7c2f1d068c Mon Sep 17 00:00:00 2001 From: Tim Duesterhus Date: Wed, 18 May 2022 00:22:15 +0200 Subject: [PATCH] CLEANUP: http_ana: Make use of the return value of stream_generate_unique_id() 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. --- src/http_ana.c | 2 +- src/stream.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/http_ana.c b/src/http_ana.c index c18d0764d..faa2d239d 100644 --- a/src/http_ana.c +++ b/src/http_ana.c @@ -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; } diff --git a/src/stream.c b/src/stream.c index 29d1a60b5..d18031e41 100644 --- a/src/stream.c +++ b/src/stream.c @@ -2850,7 +2850,7 @@ INITCALL0(STG_INIT, init_stream); /* Generates a unique ID based on the given , stores it in the given 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