Mercurial > hg > nginx
annotate src/os/unix/ngx_setproctitle.h @ 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 | 16013b71feed |
children |
rev | line source |
---|---|
509 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4412 | 4 * Copyright (C) Nginx, Inc. |
509 | 5 */ |
6 | |
7 | |
8 #ifndef _NGX_SETPROCTITLE_H_INCLUDED_ | |
9 #define _NGX_SETPROCTITLE_H_INCLUDED_ | |
10 | |
11 | |
12 #if (NGX_HAVE_SETPROCTITLE) | |
13 | |
14 /* FreeBSD, NetBSD, OpenBSD */ | |
15 | |
5826
16013b71feed
Added ngx_init_setproctitle() return code check.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
16 #define ngx_init_setproctitle(log) NGX_OK |
3285 | 17 #define ngx_setproctitle(title) setproctitle("%s", title) |
509 | 18 |
19 | |
515 | 20 #else /* !NGX_HAVE_SETPROCTITLE */ |
509 | 21 |
515 | 22 #if !defined NGX_SETPROCTITLE_USES_ENV |
509 | 23 |
24 #if (NGX_SOLARIS) | |
25 | |
515 | 26 #define NGX_SETPROCTITLE_USES_ENV 1 |
509 | 27 #define NGX_SETPROCTITLE_PAD ' ' |
28 | |
29 ngx_int_t ngx_init_setproctitle(ngx_log_t *log); | |
30 void ngx_setproctitle(char *title); | |
31 | |
515 | 32 #elif (NGX_LINUX) || (NGX_DARWIN) |
509 | 33 |
515 | 34 #define NGX_SETPROCTITLE_USES_ENV 1 |
35 #define NGX_SETPROCTITLE_PAD '\0' | |
36 | |
37 ngx_int_t ngx_init_setproctitle(ngx_log_t *log); | |
38 void ngx_setproctitle(char *title); | |
39 | |
40 #else | |
509 | 41 |
5826
16013b71feed
Added ngx_init_setproctitle() return code check.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
42 #define ngx_init_setproctitle(log) NGX_OK |
509 | 43 #define ngx_setproctitle(title) |
44 | |
515 | 45 #endif /* OSes */ |
46 | |
47 #endif /* NGX_SETPROCTITLE_USES_ENV */ | |
48 | |
49 #endif /* NGX_HAVE_SETPROCTITLE */ | |
509 | 50 |
51 | |
52 #endif /* _NGX_SETPROCTITLE_H_INCLUDED_ */ |