Mercurial > hg > nginx
view src/core/ngx_queue.c @ 9295:c5623963c29e
Upstream: fixed proxy_no_cache when caching errors.
Caching errors, notably intercepted errors and internally generated
502/504 errors, as well as handling of cache revalidation with 304,
did not take into account u->conf->no_cache predicates configured.
As a result, an error might be cached even if configuration explicitly
says not to. Fix is to check u->conf->no_cache in these cases.
To simplify usage in multiple places, checking u->conf->no_cache is now
done in a separate function. As a minor optimization, u->conf->no_cache
is only checked if u->cacheable is set.
As a side effect, this change also fixes caching errors after
proxy_cache_bypass. Also, during cache revalidation u->cacheable is
now tested, so 304 responses which disable caching won't extend
cacheability of stored responses.
Additionally, when caching internally generated 502/504 errors
u->cacheable is now explicitly updated from u->headers_in.no_cache and
u->headers_in.expired, restoring the behaviour before 8041:0784ab86ad08
(1.23.0) when an error happens while reading the response headers.
Reported by Kirill A. Korinsky,
https://freenginx.org/pipermail/nginx/2024-April/000082.html
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 25 Jun 2024 21:44:50 +0300 |
parents | 3038bd4d7816 |
children |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev * Copyright (C) Nginx, Inc. */ #include <ngx_config.h> #include <ngx_core.h> static void ngx_queue_merge(ngx_queue_t *queue, ngx_queue_t *tail, ngx_int_t (*cmp)(const ngx_queue_t *, const ngx_queue_t *)); /* * find the middle queue element if the queue has odd number of elements * or the first element of the queue's second part otherwise */ ngx_queue_t * ngx_queue_middle(ngx_queue_t *queue) { ngx_queue_t *middle, *next; middle = ngx_queue_head(queue); if (middle == ngx_queue_last(queue)) { return middle; } next = ngx_queue_head(queue); for ( ;; ) { middle = ngx_queue_next(middle); next = ngx_queue_next(next); if (next == ngx_queue_last(queue)) { return middle; } next = ngx_queue_next(next); if (next == ngx_queue_last(queue)) { return middle; } } } /* the stable merge sort */ void ngx_queue_sort(ngx_queue_t *queue, ngx_int_t (*cmp)(const ngx_queue_t *, const ngx_queue_t *)) { ngx_queue_t *q, tail; q = ngx_queue_head(queue); if (q == ngx_queue_last(queue)) { return; } q = ngx_queue_middle(queue); ngx_queue_split(queue, q, &tail); ngx_queue_sort(queue, cmp); ngx_queue_sort(&tail, cmp); ngx_queue_merge(queue, &tail, cmp); } static void ngx_queue_merge(ngx_queue_t *queue, ngx_queue_t *tail, ngx_int_t (*cmp)(const ngx_queue_t *, const ngx_queue_t *)) { ngx_queue_t *q1, *q2; q1 = ngx_queue_head(queue); q2 = ngx_queue_head(tail); for ( ;; ) { if (q1 == ngx_queue_sentinel(queue)) { ngx_queue_add(queue, tail); break; } if (q2 == ngx_queue_sentinel(tail)) { break; } if (cmp(q1, q2) <= 0) { q1 = ngx_queue_next(q1); continue; } ngx_queue_remove(q2); ngx_queue_insert_before(q1, q2); q2 = ngx_queue_head(tail); } }