annotate src/os/win32/nginx_icon48.xpm @ 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 37580bd13ca5
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2734
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
1 /* XPM */
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
2 static char * nginx_xpm[] = {
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
3 "48 48 2 2",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
4 /* colors */
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
5 " c none",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
6 "GG c #009900",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
7 /* pixels */
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
8 " ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
9 " ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
10 " ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
11 " ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
12 " ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
13 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
14 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
15 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
16 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
17 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
18 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
19 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
20 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
21 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
22 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
23 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
24 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
25 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
26 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
27 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
28 " GGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
29 " GGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
30 " GGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
31 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
32 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
33 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
34 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
35 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
36 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
37 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
38 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
39 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
40 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
41 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
42 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
43 " GGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
44 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
45 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
46 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
47 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
48 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
49 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
50 " GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
51 " ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
52 " ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
53 " ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
54 " ",
37580bd13ca5 add 48x48 icon
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
55 " ",