Mercurial > hg > nginx
annotate src/stream/ngx_stream_upstream.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 | bfad703459b4 |
children |
rev | line source |
---|---|
6115 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4 * Copyright (C) Nginx, Inc. | |
5 */ | |
6 | |
7 | |
8 #ifndef _NGX_STREAM_UPSTREAM_H_INCLUDED_ | |
9 #define _NGX_STREAM_UPSTREAM_H_INCLUDED_ | |
10 | |
11 | |
12 #include <ngx_config.h> | |
13 #include <ngx_core.h> | |
14 #include <ngx_stream.h> | |
15 #include <ngx_event_connect.h> | |
16 | |
17 | |
18 #define NGX_STREAM_UPSTREAM_CREATE 0x0001 | |
19 #define NGX_STREAM_UPSTREAM_WEIGHT 0x0002 | |
20 #define NGX_STREAM_UPSTREAM_MAX_FAILS 0x0004 | |
21 #define NGX_STREAM_UPSTREAM_FAIL_TIMEOUT 0x0008 | |
22 #define NGX_STREAM_UPSTREAM_DOWN 0x0010 | |
23 #define NGX_STREAM_UPSTREAM_BACKUP 0x0020 | |
6705 | 24 #define NGX_STREAM_UPSTREAM_MAX_CONNS 0x0100 |
6115 | 25 |
26 | |
6863
54cf51c4f07a
Stream: speed up TCP peer recovery.
Roman Arutyunyan <arut@nginx.com>
parents:
6785
diff
changeset
|
27 #define NGX_STREAM_UPSTREAM_NOTIFY_CONNECT 0x1 |
54cf51c4f07a
Stream: speed up TCP peer recovery.
Roman Arutyunyan <arut@nginx.com>
parents:
6785
diff
changeset
|
28 |
54cf51c4f07a
Stream: speed up TCP peer recovery.
Roman Arutyunyan <arut@nginx.com>
parents:
6785
diff
changeset
|
29 |
6115 | 30 typedef struct { |
31 ngx_array_t upstreams; | |
32 /* ngx_stream_upstream_srv_conf_t */ | |
33 } ngx_stream_upstream_main_conf_t; | |
34 | |
35 | |
36 typedef struct ngx_stream_upstream_srv_conf_s ngx_stream_upstream_srv_conf_t; | |
37 | |
38 | |
39 typedef ngx_int_t (*ngx_stream_upstream_init_pt)(ngx_conf_t *cf, | |
40 ngx_stream_upstream_srv_conf_t *us); | |
41 typedef ngx_int_t (*ngx_stream_upstream_init_peer_pt)(ngx_stream_session_t *s, | |
42 ngx_stream_upstream_srv_conf_t *us); | |
43 | |
44 | |
45 typedef struct { | |
46 ngx_stream_upstream_init_pt init_upstream; | |
47 ngx_stream_upstream_init_peer_pt init; | |
48 void *data; | |
49 } ngx_stream_upstream_peer_t; | |
50 | |
51 | |
52 typedef struct { | |
53 ngx_str_t name; | |
54 ngx_addr_t *addrs; | |
55 ngx_uint_t naddrs; | |
56 ngx_uint_t weight; | |
6705 | 57 ngx_uint_t max_conns; |
6115 | 58 ngx_uint_t max_fails; |
59 time_t fail_timeout; | |
6708
4080f94a996f
Modules compatibility: slow start fields.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6705
diff
changeset
|
60 ngx_msec_t slow_start; |
7112
5a3ab1b5804b
Modules compatibility: down flag promoted to a bitmask.
Ruslan Ermilov <ru@nginx.com>
parents:
6863
diff
changeset
|
61 ngx_uint_t down; |
6115 | 62 |
63 unsigned backup:1; | |
6715
d200a0fd00b7
Introduced the NGX_COMPAT macro.
Ruslan Ermilov <ru@nginx.com>
parents:
6708
diff
changeset
|
64 |
d200a0fd00b7
Introduced the NGX_COMPAT macro.
Ruslan Ermilov <ru@nginx.com>
parents:
6708
diff
changeset
|
65 NGX_COMPAT_BEGIN(4) |
d200a0fd00b7
Introduced the NGX_COMPAT macro.
Ruslan Ermilov <ru@nginx.com>
parents:
6708
diff
changeset
|
66 NGX_COMPAT_END |
6115 | 67 } ngx_stream_upstream_server_t; |
68 | |
69 | |
70 struct ngx_stream_upstream_srv_conf_s { | |
71 ngx_stream_upstream_peer_t peer; | |
72 void **srv_conf; | |
73 | |
74 ngx_array_t *servers; | |
75 /* ngx_stream_upstream_server_t */ | |
76 | |
77 ngx_uint_t flags; | |
78 ngx_str_t host; | |
79 u_char *file_name; | |
80 ngx_uint_t line; | |
81 in_port_t port; | |
82 ngx_uint_t no_port; /* unsigned no_port:1 */ | |
83 | |
84 #if (NGX_STREAM_UPSTREAM_ZONE) | |
85 ngx_shm_zone_t *shm_zone; | |
86 #endif | |
87 }; | |
88 | |
89 | |
90 typedef struct { | |
6677
c02290241cbe
Stream: upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
6676
diff
changeset
|
91 ngx_msec_t response_time; |
c02290241cbe
Stream: upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
6676
diff
changeset
|
92 ngx_msec_t connect_time; |
c02290241cbe
Stream: upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
6676
diff
changeset
|
93 ngx_msec_t first_byte_time; |
6676
df3a7c029dec
Stream: $upstream_bytes_sent and $upstream_bytes_received.
Vladimir Homutov <vl@nginx.com>
parents:
6675
diff
changeset
|
94 off_t bytes_sent; |
df3a7c029dec
Stream: $upstream_bytes_sent and $upstream_bytes_received.
Vladimir Homutov <vl@nginx.com>
parents:
6675
diff
changeset
|
95 off_t bytes_received; |
df3a7c029dec
Stream: $upstream_bytes_sent and $upstream_bytes_received.
Vladimir Homutov <vl@nginx.com>
parents:
6675
diff
changeset
|
96 |
6675
ab9b4fd8c5b7
Stream: the $upstream_addr variable.
Vladimir Homutov <vl@nginx.com>
parents:
6643
diff
changeset
|
97 ngx_str_t *peer; |
ab9b4fd8c5b7
Stream: the $upstream_addr variable.
Vladimir Homutov <vl@nginx.com>
parents:
6643
diff
changeset
|
98 } ngx_stream_upstream_state_t; |
ab9b4fd8c5b7
Stream: the $upstream_addr variable.
Vladimir Homutov <vl@nginx.com>
parents:
6643
diff
changeset
|
99 |
ab9b4fd8c5b7
Stream: the $upstream_addr variable.
Vladimir Homutov <vl@nginx.com>
parents:
6643
diff
changeset
|
100 |
ab9b4fd8c5b7
Stream: the $upstream_addr variable.
Vladimir Homutov <vl@nginx.com>
parents:
6643
diff
changeset
|
101 typedef struct { |
6643
9757cffc1e2f
Stream: variables in proxy_pass and proxy_ssl_name.
Vladimir Homutov <vl@nginx.com>
parents:
6436
diff
changeset
|
102 ngx_str_t host; |
9757cffc1e2f
Stream: variables in proxy_pass and proxy_ssl_name.
Vladimir Homutov <vl@nginx.com>
parents:
6436
diff
changeset
|
103 in_port_t port; |
9757cffc1e2f
Stream: variables in proxy_pass and proxy_ssl_name.
Vladimir Homutov <vl@nginx.com>
parents:
6436
diff
changeset
|
104 ngx_uint_t no_port; /* unsigned no_port:1 */ |
9757cffc1e2f
Stream: variables in proxy_pass and proxy_ssl_name.
Vladimir Homutov <vl@nginx.com>
parents:
6436
diff
changeset
|
105 |
9757cffc1e2f
Stream: variables in proxy_pass and proxy_ssl_name.
Vladimir Homutov <vl@nginx.com>
parents:
6436
diff
changeset
|
106 ngx_uint_t naddrs; |
9757cffc1e2f
Stream: variables in proxy_pass and proxy_ssl_name.
Vladimir Homutov <vl@nginx.com>
parents:
6436
diff
changeset
|
107 ngx_resolver_addr_t *addrs; |
9757cffc1e2f
Stream: variables in proxy_pass and proxy_ssl_name.
Vladimir Homutov <vl@nginx.com>
parents:
6436
diff
changeset
|
108 |
9757cffc1e2f
Stream: variables in proxy_pass and proxy_ssl_name.
Vladimir Homutov <vl@nginx.com>
parents:
6436
diff
changeset
|
109 struct sockaddr *sockaddr; |
9757cffc1e2f
Stream: variables in proxy_pass and proxy_ssl_name.
Vladimir Homutov <vl@nginx.com>
parents:
6436
diff
changeset
|
110 socklen_t socklen; |
6785
d1d0dd69a419
Upstream: added the ngx_http_upstream_resolved_t.name field.
Ruslan Ermilov <ru@nginx.com>
parents:
6736
diff
changeset
|
111 ngx_str_t name; |
6643
9757cffc1e2f
Stream: variables in proxy_pass and proxy_ssl_name.
Vladimir Homutov <vl@nginx.com>
parents:
6436
diff
changeset
|
112 |
9757cffc1e2f
Stream: variables in proxy_pass and proxy_ssl_name.
Vladimir Homutov <vl@nginx.com>
parents:
6436
diff
changeset
|
113 ngx_resolver_ctx_t *ctx; |
9757cffc1e2f
Stream: variables in proxy_pass and proxy_ssl_name.
Vladimir Homutov <vl@nginx.com>
parents:
6436
diff
changeset
|
114 } ngx_stream_upstream_resolved_t; |
9757cffc1e2f
Stream: variables in proxy_pass and proxy_ssl_name.
Vladimir Homutov <vl@nginx.com>
parents:
6436
diff
changeset
|
115 |
9757cffc1e2f
Stream: variables in proxy_pass and proxy_ssl_name.
Vladimir Homutov <vl@nginx.com>
parents:
6436
diff
changeset
|
116 |
9757cffc1e2f
Stream: variables in proxy_pass and proxy_ssl_name.
Vladimir Homutov <vl@nginx.com>
parents:
6436
diff
changeset
|
117 typedef struct { |
6115 | 118 ngx_peer_connection_t peer; |
6692 | 119 |
6115 | 120 ngx_buf_t downstream_buf; |
121 ngx_buf_t upstream_buf; | |
6692 | 122 |
123 ngx_chain_t *free; | |
124 ngx_chain_t *upstream_out; | |
125 ngx_chain_t *upstream_busy; | |
126 ngx_chain_t *downstream_out; | |
127 ngx_chain_t *downstream_busy; | |
128 | |
6115 | 129 off_t received; |
6201
24488e6db782
Stream: upstream and downstream limit rates.
Roman Arutyunyan <arut@nginx.com>
parents:
6184
diff
changeset
|
130 time_t start_sec; |
7286 | 131 ngx_uint_t requests; |
6436 | 132 ngx_uint_t responses; |
7397
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7286
diff
changeset
|
133 ngx_msec_t start_time; |
6692 | 134 |
7505
16a1adadf437
Variables support in proxy_upload_rate and proxy_download_rate.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
135 size_t upload_rate; |
16a1adadf437
Variables support in proxy_upload_rate and proxy_download_rate.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
136 size_t download_rate; |
16a1adadf437
Variables support in proxy_upload_rate and proxy_download_rate.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
137 |
6115 | 138 ngx_str_t ssl_name; |
6692 | 139 |
6703
edcd9303a4d3
Upstream: introduced u->upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6692
diff
changeset
|
140 ngx_stream_upstream_srv_conf_t *upstream; |
6643
9757cffc1e2f
Stream: variables in proxy_pass and proxy_ssl_name.
Vladimir Homutov <vl@nginx.com>
parents:
6436
diff
changeset
|
141 ngx_stream_upstream_resolved_t *resolved; |
6675
ab9b4fd8c5b7
Stream: the $upstream_addr variable.
Vladimir Homutov <vl@nginx.com>
parents:
6643
diff
changeset
|
142 ngx_stream_upstream_state_t *state; |
6202
6345822f0abb
Stream: upstream "connected" flag.
Roman Arutyunyan <arut@nginx.com>
parents:
6201
diff
changeset
|
143 unsigned connected:1; |
6345822f0abb
Stream: upstream "connected" flag.
Roman Arutyunyan <arut@nginx.com>
parents:
6201
diff
changeset
|
144 unsigned proxy_protocol:1; |
7929
bfad703459b4
Stream: added half-close support.
Vladimir Homutov <vl@nginx.com>
parents:
7505
diff
changeset
|
145 unsigned half_closed:1; |
6115 | 146 } ngx_stream_upstream_t; |
147 | |
148 | |
149 ngx_stream_upstream_srv_conf_t *ngx_stream_upstream_add(ngx_conf_t *cf, | |
150 ngx_url_t *u, ngx_uint_t flags); | |
151 | |
152 | |
153 #define ngx_stream_conf_upstream_srv_conf(uscf, module) \ | |
154 uscf->srv_conf[module.ctx_index] | |
155 | |
156 | |
157 extern ngx_module_t ngx_stream_upstream_module; | |
158 | |
159 | |
160 #endif /* _NGX_STREAM_UPSTREAM_H_INCLUDED_ */ |