Mercurial > hg > nginx
annotate src/os/unix/ngx_sunpro_amd64.il @ 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 | 2cd019520210 |
children |
rev | line source |
---|---|
561 | 1 / |
2 / Copyright (C) Igor Sysoev | |
4412 | 3 / Copyright (C) Nginx, Inc. |
561 | 4 / |
5 | |
6 / ngx_atomic_uint_t ngx_atomic_cmp_set(ngx_atomic_t *lock, | |
7 / ngx_atomic_uint_t old, ngx_atomic_uint_t set); | |
8 / | |
9 / the arguments are passed in %rdi, %rsi, %rdx | |
10 / the result is returned in the %rax | |
11 | |
12 .inline ngx_atomic_cmp_set,0 | |
13 movq %rsi, %rax | |
14 lock | |
15 cmpxchgq %rdx, (%rdi) | |
16 setz %al | |
17 movzbq %al, %rax | |
18 .end | |
19 | |
20 | |
21 / ngx_atomic_int_t ngx_atomic_fetch_add(ngx_atomic_t *value, | |
22 / ngx_atomic_int_t add); | |
23 / | |
24 / the arguments are passed in %rdi, %rsi | |
25 / the result is returned in the %rax | |
26 | |
27 .inline ngx_atomic_fetch_add,0 | |
28 movq %rsi, %rax | |
29 lock | |
30 xaddq %rax, (%rdi) | |
31 .end | |
1309 | 32 |
33 | |
34 / ngx_cpu_pause() | |
3479
bfd1912e55a9
use "rep; nop" instead of "pause" on Solaris/amd64
Igor Sysoev <igor@sysoev.ru>
parents:
1309
diff
changeset
|
35 / |
bfd1912e55a9
use "rep; nop" instead of "pause" on Solaris/amd64
Igor Sysoev <igor@sysoev.ru>
parents:
1309
diff
changeset
|
36 / the "rep; nop" is used instead of "pause" to avoid the "[ PAUSE ]" hardware |
bfd1912e55a9
use "rep; nop" instead of "pause" on Solaris/amd64
Igor Sysoev <igor@sysoev.ru>
parents:
1309
diff
changeset
|
37 / capability added by linker because Solaris/amd64 does not know about it: |
bfd1912e55a9
use "rep; nop" instead of "pause" on Solaris/amd64
Igor Sysoev <igor@sysoev.ru>
parents:
1309
diff
changeset
|
38 / |
bfd1912e55a9
use "rep; nop" instead of "pause" on Solaris/amd64
Igor Sysoev <igor@sysoev.ru>
parents:
1309
diff
changeset
|
39 / ld.so.1: nginx: fatal: hardware capability unsupported: 0x2000 [ PAUSE ] |
1309 | 40 |
6474 | 41 .inline ngx_cpu_pause,0 |
42 rep; nop | |
43 .end |