]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
CLEANUP: Reduce scope of `hdr_age` in http_action_store_cache()
authorTim Duesterhus <tim@bastelstu.be>
Sat, 2 Jan 2021 21:47:17 +0000 (22:47 +0100)
committerWilliam Lallemand <wlallemand@haproxy.org>
Tue, 5 Jan 2021 16:05:58 +0000 (17:05 +0100)
This is only required to process the `age` header.

src/cache.c

index b7ea562a7deea6086d662253925a47eb128b8697..9485caa00584f87dfd04695baa2c8259601c2393 100644 (file)
@@ -977,7 +977,6 @@ static void set_secondary_key_encoding(struct htx *htx, char *secondary_key)
 enum act_return http_action_store_cache(struct act_rule *rule, struct proxy *px,
                                        struct session *sess, struct stream *s, int flags)
 {
-       long long hdr_age;
        int effective_maxage = 0;
        int true_maxage = 0;
        struct http_txn *txn = s->txn;
@@ -1147,6 +1146,7 @@ enum act_return http_action_store_cache(struct act_rule *rule, struct proxy *px,
 
        ctx.blk = NULL;
        if (http_find_header(htx, ist("Age"), &ctx, 0)) {
+               long long hdr_age;
                if (!strl2llrc(ctx.value.ptr, ctx.value.len, &hdr_age) && hdr_age > 0) {
                        if (unlikely(hdr_age > CACHE_ENTRY_MAX_AGE))
                                hdr_age = CACHE_ENTRY_MAX_AGE;