Mercurial > hg > nginx-quic
annotate src/http/ngx_http_upstream.c @ 2386:4ccaa42de633
use already available r and u instead of ev
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 09 Dec 2008 17:25:03 +0000 |
parents | 3d7a70173d77 |
children | dbe746851b31 |
rev | line source |
---|---|
479 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4 */ | |
5 | |
6 | |
7 #include <ngx_config.h> | |
8 #include <ngx_core.h> | |
9 #include <ngx_http.h> | |
10 | |
11 | |
1658 | 12 static void ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx); |
509 | 13 static void ngx_http_upstream_rd_check_broken_connection(ngx_http_request_t *r); |
14 static void ngx_http_upstream_wr_check_broken_connection(ngx_http_request_t *r); | |
15 static void ngx_http_upstream_check_broken_connection(ngx_http_request_t *r, | |
16 ngx_event_t *ev); | |
479 | 17 static void ngx_http_upstream_connect(ngx_http_request_t *r, |
487 | 18 ngx_http_upstream_t *u); |
509 | 19 static ngx_int_t ngx_http_upstream_reinit(ngx_http_request_t *r, |
487 | 20 ngx_http_upstream_t *u); |
479 | 21 static void ngx_http_upstream_send_request(ngx_http_request_t *r, |
487 | 22 ngx_http_upstream_t *u); |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
23 static void ngx_http_upstream_send_request_handler(ngx_http_request_t *r, |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
24 ngx_http_upstream_t *u); |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
25 static void ngx_http_upstream_process_header(ngx_http_request_t *r, |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
26 ngx_http_upstream_t *u); |
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
27 static ngx_int_t ngx_http_upstream_test_next(ngx_http_request_t *r, |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
28 ngx_http_upstream_t *u); |
2267
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
29 static ngx_int_t ngx_http_upstream_intercept_errors(ngx_http_request_t *r, |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
30 ngx_http_upstream_t *u); |
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
31 static ngx_int_t ngx_http_upstream_test_connect(ngx_connection_t *c); |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
32 static void ngx_http_upstream_process_body_in_memory(ngx_http_request_t *r, |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
33 ngx_http_upstream_t *u); |
479 | 34 static void ngx_http_upstream_send_response(ngx_http_request_t *r, |
487 | 35 ngx_http_upstream_t *u); |
581 | 36 static void |
37 ngx_http_upstream_process_non_buffered_downstream(ngx_http_request_t *r); | |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
38 static void |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
39 ngx_http_upstream_process_non_buffered_upstream(ngx_http_request_t *r, |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
40 ngx_http_upstream_t *u); |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
41 static void |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
42 ngx_http_upstream_process_non_buffered_request(ngx_http_request_t *r, |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
43 ngx_uint_t do_write); |
581 | 44 static ngx_int_t ngx_http_upstream_non_buffered_filter_init(void *data); |
45 static ngx_int_t ngx_http_upstream_non_buffered_filter(void *data, | |
46 ssize_t bytes); | |
509 | 47 static void ngx_http_upstream_process_downstream(ngx_http_request_t *r); |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
48 static void ngx_http_upstream_process_upstream(ngx_http_request_t *r, |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
49 ngx_http_upstream_t *u); |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
50 static void ngx_http_upstream_process_request(ngx_http_request_t *r); |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
51 static void ngx_http_upstream_store(ngx_http_request_t *r, |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
52 ngx_http_upstream_t *u); |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
53 static void ngx_http_upstream_dummy_handler(ngx_http_request_t *r, |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
54 ngx_http_upstream_t *u); |
479 | 55 static void ngx_http_upstream_next(ngx_http_request_t *r, |
487 | 56 ngx_http_upstream_t *u, ngx_uint_t ft_type); |
569 | 57 static void ngx_http_upstream_cleanup(void *data); |
479 | 58 static void ngx_http_upstream_finalize_request(ngx_http_request_t *r, |
487 | 59 ngx_http_upstream_t *u, ngx_int_t rc); |
479 | 60 |
509 | 61 static ngx_int_t ngx_http_upstream_process_header_line(ngx_http_request_t *r, |
62 ngx_table_elt_t *h, ngx_uint_t offset); | |
63 static ngx_int_t | |
64 ngx_http_upstream_process_multi_header_lines(ngx_http_request_t *r, | |
65 ngx_table_elt_t *h, ngx_uint_t offset); | |
66 static ngx_int_t ngx_http_upstream_ignore_header_line(ngx_http_request_t *r, | |
67 ngx_table_elt_t *h, ngx_uint_t offset); | |
527 | 68 static ngx_int_t ngx_http_upstream_process_limit_rate(ngx_http_request_t *r, |
69 ngx_table_elt_t *h, ngx_uint_t offset); | |
649 | 70 static ngx_int_t ngx_http_upstream_process_buffering(ngx_http_request_t *r, |
509 | 71 ngx_table_elt_t *h, ngx_uint_t offset); |
657 | 72 static ngx_int_t ngx_http_upstream_process_charset(ngx_http_request_t *r, |
73 ngx_table_elt_t *h, ngx_uint_t offset); | |
649 | 74 static ngx_int_t ngx_http_upstream_copy_header_line(ngx_http_request_t *r, |
509 | 75 ngx_table_elt_t *h, ngx_uint_t offset); |
76 static ngx_int_t | |
77 ngx_http_upstream_copy_multi_header_lines(ngx_http_request_t *r, | |
78 ngx_table_elt_t *h, ngx_uint_t offset); | |
79 static ngx_int_t ngx_http_upstream_copy_content_type(ngx_http_request_t *r, | |
80 ngx_table_elt_t *h, ngx_uint_t offset); | |
81 static ngx_int_t ngx_http_upstream_copy_content_length(ngx_http_request_t *r, | |
82 ngx_table_elt_t *h, ngx_uint_t offset); | |
83 static ngx_int_t ngx_http_upstream_rewrite_location(ngx_http_request_t *r, | |
84 ngx_table_elt_t *h, ngx_uint_t offset); | |
85 static ngx_int_t ngx_http_upstream_rewrite_refresh(ngx_http_request_t *r, | |
86 ngx_table_elt_t *h, ngx_uint_t offset); | |
87 #if (NGX_HTTP_GZIP) | |
88 static ngx_int_t ngx_http_upstream_copy_content_encoding(ngx_http_request_t *r, | |
89 ngx_table_elt_t *h, ngx_uint_t offset); | |
90 #endif | |
91 | |
573 | 92 static ngx_int_t ngx_http_upstream_add_variables(ngx_conf_t *cf); |
1181 | 93 static ngx_int_t ngx_http_upstream_addr_variable(ngx_http_request_t *r, |
94 ngx_http_variable_value_t *v, uintptr_t data); | |
573 | 95 static ngx_int_t ngx_http_upstream_status_variable(ngx_http_request_t *r, |
96 ngx_http_variable_value_t *v, uintptr_t data); | |
97 static ngx_int_t ngx_http_upstream_response_time_variable(ngx_http_request_t *r, | |
98 ngx_http_variable_value_t *v, uintptr_t data); | |
99 | |
651 | 100 static char *ngx_http_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy); |
101 static char *ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, | |
102 void *conf); | |
103 | |
509 | 104 static void *ngx_http_upstream_create_main_conf(ngx_conf_t *cf); |
651 | 105 static char *ngx_http_upstream_init_main_conf(ngx_conf_t *cf, void *conf); |
509 | 106 |
577 | 107 #if (NGX_HTTP_SSL) |
591 | 108 static void ngx_http_upstream_ssl_init_connection(ngx_http_request_t *, |
109 ngx_http_upstream_t *u, ngx_connection_t *c); | |
577 | 110 static void ngx_http_upstream_ssl_handshake(ngx_connection_t *c); |
111 #endif | |
112 | |
509 | 113 |
114 ngx_http_upstream_header_t ngx_http_upstream_headers_in[] = { | |
115 | |
116 { ngx_string("Status"), | |
117 ngx_http_upstream_process_header_line, | |
118 offsetof(ngx_http_upstream_headers_in_t, status), | |
649 | 119 ngx_http_upstream_copy_header_line, 0, 0 }, |
509 | 120 |
121 { ngx_string("Content-Type"), | |
122 ngx_http_upstream_process_header_line, | |
123 offsetof(ngx_http_upstream_headers_in_t, content_type), | |
673 | 124 ngx_http_upstream_copy_content_type, 0, 1 }, |
509 | 125 |
126 { ngx_string("Content-Length"), | |
127 ngx_http_upstream_process_header_line, | |
128 offsetof(ngx_http_upstream_headers_in_t, content_length), | |
515 | 129 ngx_http_upstream_copy_content_length, 0, 0 }, |
509 | 130 |
131 { ngx_string("Date"), | |
132 ngx_http_upstream_process_header_line, | |
133 offsetof(ngx_http_upstream_headers_in_t, date), | |
649 | 134 ngx_http_upstream_copy_header_line, |
135 offsetof(ngx_http_headers_out_t, date), 0 }, | |
509 | 136 |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
137 { ngx_string("Last-Modified"), |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
138 ngx_http_upstream_process_header_line, |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
139 offsetof(ngx_http_upstream_headers_in_t, last_modified), |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
140 ngx_http_upstream_copy_header_line, |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
141 offsetof(ngx_http_headers_out_t, last_modified), 0 }, |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
142 |
509 | 143 { ngx_string("Server"), |
144 ngx_http_upstream_process_header_line, | |
145 offsetof(ngx_http_upstream_headers_in_t, server), | |
649 | 146 ngx_http_upstream_copy_header_line, |
147 offsetof(ngx_http_headers_out_t, server), 0 }, | |
509 | 148 |
529 | 149 { ngx_string("WWW-Authenticate"), |
150 ngx_http_upstream_process_header_line, | |
151 offsetof(ngx_http_upstream_headers_in_t, www_authenticate), | |
152 ngx_http_upstream_copy_header_line, 0, 0 }, | |
153 | |
509 | 154 { ngx_string("Location"), |
2140
dce5ddef5af9
if upstream sent a location header without status use 302
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
155 ngx_http_upstream_process_header_line, |
dce5ddef5af9
if upstream sent a location header without status use 302
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
156 offsetof(ngx_http_upstream_headers_in_t, location), |
515 | 157 ngx_http_upstream_rewrite_location, 0, 0 }, |
509 | 158 |
159 { ngx_string("Refresh"), | |
160 ngx_http_upstream_ignore_header_line, 0, | |
515 | 161 ngx_http_upstream_rewrite_refresh, 0, 0 }, |
162 | |
163 { ngx_string("Set-Cookie"), | |
164 ngx_http_upstream_ignore_header_line, 0, | |
531 | 165 ngx_http_upstream_copy_header_line, 0, 1 }, |
166 | |
167 { ngx_string("Content-Disposition"), | |
168 ngx_http_upstream_ignore_header_line, 0, | |
169 ngx_http_upstream_copy_header_line, 0, 1 }, | |
509 | 170 |
171 { ngx_string("Cache-Control"), | |
172 ngx_http_upstream_process_multi_header_lines, | |
173 offsetof(ngx_http_upstream_headers_in_t, cache_control), | |
174 ngx_http_upstream_copy_multi_header_lines, | |
515 | 175 offsetof(ngx_http_headers_out_t, cache_control), 1 }, |
509 | 176 |
573 | 177 { ngx_string("Expires"), |
178 ngx_http_upstream_process_header_line, | |
179 offsetof(ngx_http_upstream_headers_in_t, expires), | |
180 ngx_http_upstream_copy_header_line, | |
181 offsetof(ngx_http_headers_out_t, expires), 1 }, | |
182 | |
577 | 183 { ngx_string("Accept-Ranges"), |
184 ngx_http_upstream_process_header_line, | |
185 offsetof(ngx_http_upstream_headers_in_t, accept_ranges), | |
186 ngx_http_upstream_copy_header_line, | |
187 offsetof(ngx_http_headers_out_t, accept_ranges), 1 }, | |
188 | |
509 | 189 { ngx_string("Connection"), |
190 ngx_http_upstream_ignore_header_line, 0, | |
515 | 191 ngx_http_upstream_ignore_header_line, 0, 0 }, |
509 | 192 |
641 | 193 { ngx_string("Keep-Alive"), |
194 ngx_http_upstream_ignore_header_line, 0, | |
195 ngx_http_upstream_ignore_header_line, 0, 0 }, | |
196 | |
509 | 197 { ngx_string("X-Powered-By"), |
198 ngx_http_upstream_ignore_header_line, 0, | |
649 | 199 ngx_http_upstream_copy_header_line, 0, 0 }, |
509 | 200 |
201 { ngx_string("X-Accel-Expires"), | |
202 ngx_http_upstream_process_header_line, | |
203 offsetof(ngx_http_upstream_headers_in_t, x_accel_expires), | |
649 | 204 ngx_http_upstream_copy_header_line, 0, 0 }, |
515 | 205 |
206 { ngx_string("X-Accel-Redirect"), | |
207 ngx_http_upstream_process_header_line, | |
208 offsetof(ngx_http_upstream_headers_in_t, x_accel_redirect), | |
209 ngx_http_upstream_ignore_header_line, 0, 0 }, | |
509 | 210 |
527 | 211 { ngx_string("X-Accel-Limit-Rate"), |
212 ngx_http_upstream_process_limit_rate, 0, | |
213 ngx_http_upstream_ignore_header_line, 0, 0 }, | |
214 | |
649 | 215 { ngx_string("X-Accel-Buffering"), |
216 ngx_http_upstream_process_buffering, 0, | |
217 ngx_http_upstream_ignore_header_line, 0, 0 }, | |
218 | |
657 | 219 { ngx_string("X-Accel-Charset"), |
220 ngx_http_upstream_process_charset, 0, | |
221 ngx_http_upstream_ignore_header_line, 0, 0 }, | |
222 | |
509 | 223 #if (NGX_HTTP_GZIP) |
224 { ngx_string("Content-Encoding"), | |
225 ngx_http_upstream_process_header_line, | |
226 offsetof(ngx_http_upstream_headers_in_t, content_encoding), | |
515 | 227 ngx_http_upstream_copy_content_encoding, 0, 0 }, |
509 | 228 #endif |
229 | |
515 | 230 { ngx_null_string, NULL, 0, NULL, 0, 0 } |
509 | 231 }; |
479 | 232 |
233 | |
651 | 234 static ngx_command_t ngx_http_upstream_commands[] = { |
235 | |
236 { ngx_string("upstream"), | |
237 NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE1, | |
238 ngx_http_upstream, | |
239 0, | |
240 0, | |
241 NULL }, | |
242 | |
243 { ngx_string("server"), | |
884 | 244 NGX_HTTP_UPS_CONF|NGX_CONF_1MORE, |
651 | 245 ngx_http_upstream_server, |
246 NGX_HTTP_SRV_CONF_OFFSET, | |
247 0, | |
248 NULL }, | |
249 | |
250 ngx_null_command | |
251 }; | |
252 | |
253 | |
254 static ngx_http_module_t ngx_http_upstream_module_ctx = { | |
573 | 255 ngx_http_upstream_add_variables, /* preconfiguration */ |
509 | 256 NULL, /* postconfiguration */ |
257 | |
258 ngx_http_upstream_create_main_conf, /* create main configuration */ | |
651 | 259 ngx_http_upstream_init_main_conf, /* init main configuration */ |
479 | 260 |
261 NULL, /* create server configuration */ | |
262 NULL, /* merge server configuration */ | |
263 | |
264 NULL, /* create location configuration */ | |
265 NULL /* merge location configuration */ | |
266 }; | |
577 | 267 |
479 | 268 |
269 ngx_module_t ngx_http_upstream_module = { | |
509 | 270 NGX_MODULE_V1, |
479 | 271 &ngx_http_upstream_module_ctx, /* module context */ |
651 | 272 ngx_http_upstream_commands, /* module directives */ |
479 | 273 NGX_HTTP_MODULE, /* module type */ |
541 | 274 NULL, /* init master */ |
479 | 275 NULL, /* init module */ |
541 | 276 NULL, /* init process */ |
277 NULL, /* init thread */ | |
278 NULL, /* exit thread */ | |
279 NULL, /* exit process */ | |
280 NULL, /* exit master */ | |
281 NGX_MODULE_V1_PADDING | |
479 | 282 }; |
283 | |
284 | |
573 | 285 static ngx_http_variable_t ngx_http_upstream_vars[] = { |
286 | |
1181 | 287 { ngx_string("upstream_addr"), NULL, |
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
288 ngx_http_upstream_addr_variable, 0, |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
289 NGX_HTTP_VAR_NOHASH|NGX_HTTP_VAR_NOCACHEABLE, 0 }, |
1181 | 290 |
637 | 291 { ngx_string("upstream_status"), NULL, |
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
292 ngx_http_upstream_status_variable, 0, |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
293 NGX_HTTP_VAR_NOHASH|NGX_HTTP_VAR_NOCACHEABLE, 0 }, |
573 | 294 |
637 | 295 { ngx_string("upstream_response_time"), NULL, |
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
296 ngx_http_upstream_response_time_variable, 0, |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
297 NGX_HTTP_VAR_NOHASH|NGX_HTTP_VAR_NOCACHEABLE, 0 }, |
573 | 298 |
637 | 299 { ngx_null_string, NULL, NULL, 0, 0, 0 } |
573 | 300 }; |
301 | |
302 | |
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
303 static ngx_http_upstream_next_t ngx_http_upstream_next_errors[] = { |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
304 { 500, NGX_HTTP_UPSTREAM_FT_HTTP_500 }, |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
305 { 502, NGX_HTTP_UPSTREAM_FT_HTTP_502 }, |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
306 { 503, NGX_HTTP_UPSTREAM_FT_HTTP_503 }, |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
307 { 504, NGX_HTTP_UPSTREAM_FT_HTTP_504 }, |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
308 { 404, NGX_HTTP_UPSTREAM_FT_HTTP_404 }, |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
309 { 0, 0 } |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
310 }; |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
311 |
487 | 312 void |
313 ngx_http_upstream_init(ngx_http_request_t *r) | |
479 | 314 { |
1658 | 315 ngx_str_t *host; |
316 ngx_uint_t i; | |
317 ngx_connection_t *c; | |
318 ngx_resolver_ctx_t *ctx, temp; | |
319 ngx_http_cleanup_t *cln; | |
320 ngx_http_upstream_t *u; | |
321 ngx_http_core_loc_conf_t *clcf; | |
322 ngx_http_upstream_srv_conf_t *uscf, **uscfp; | |
323 ngx_http_upstream_main_conf_t *umcf; | |
479 | 324 |
325 c = r->connection; | |
326 | |
327 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, | |
328 "http init upstream, client timer: %d", c->read->timer_set); | |
329 | |
330 if (c->read->timer_set) { | |
331 ngx_del_timer(c->read); | |
332 } | |
333 | |
629 | 334 u = r->upstream; |
335 | |
336 if (!r->post_action && !u->conf->ignore_client_abort) { | |
615 | 337 r->read_event_handler = ngx_http_upstream_rd_check_broken_connection; |
338 r->write_event_handler = ngx_http_upstream_wr_check_broken_connection; | |
339 } | |
577 | 340 |
479 | 341 if (ngx_event_flags & NGX_USE_CLEAR_EVENT) { |
342 | |
343 if (!c->write->active) { | |
531 | 344 if (ngx_add_event(c->write, NGX_WRITE_EVENT, NGX_CLEAR_EVENT) |
345 == NGX_ERROR) | |
479 | 346 { |
347 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); | |
348 return; | |
349 } | |
350 } | |
351 } | |
352 | |
537 | 353 if (r->request_body) { |
354 u->request_bufs = r->request_body->bufs; | |
355 } | |
509 | 356 |
537 | 357 if (u->create_request(r) != NGX_OK) { |
479 | 358 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); |
359 return; | |
360 } | |
361 | |
509 | 362 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
479 | 363 |
364 u->output.pool = r->pool; | |
365 u->output.bufs.num = 1; | |
509 | 366 u->output.bufs.size = clcf->client_body_buffer_size; |
479 | 367 u->output.output_filter = ngx_chain_writer; |
368 u->output.filter_ctx = &u->writer; | |
369 | |
370 u->writer.pool = r->pool; | |
371 | |
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
372 if (r->upstream_states == NULL) { |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
373 |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
374 r->upstream_states = ngx_array_create(r->pool, 1, |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
375 sizeof(ngx_http_upstream_state_t)); |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
376 if (r->upstream_states == NULL) { |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
377 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
378 return; |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
379 } |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
380 |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
381 } else { |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
382 |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
383 u->state = ngx_array_push(r->upstream_states); |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
384 if (u->state == NULL) { |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
385 ngx_http_upstream_finalize_request(r, u, |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
386 NGX_HTTP_INTERNAL_SERVER_ERROR); |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
387 return; |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
388 } |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
389 |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
390 ngx_memzero(u->state, sizeof(ngx_http_upstream_state_t)); |
479 | 391 } |
392 | |
593 | 393 cln = ngx_http_cleanup_add(r, 0); |
569 | 394 if (cln == NULL) { |
395 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); | |
396 return; | |
397 } | |
398 | |
399 cln->handler = ngx_http_upstream_cleanup; | |
400 cln->data = r; | |
401 u->cleanup = &cln->handler; | |
402 | |
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
403 u->store = (u->conf->store || u->conf->store_lengths); |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
404 |
1658 | 405 if (u->resolved == NULL) { |
406 | |
407 uscf = u->conf->upstream; | |
408 | |
409 } else { | |
410 | |
1705 | 411 host = &u->resolved->host; |
1658 | 412 |
413 umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module); | |
414 | |
415 uscfp = umcf->upstreams.elts; | |
416 | |
417 for (i = 0; i < umcf->upstreams.nelts; i++) { | |
418 | |
419 uscf = uscfp[i]; | |
420 | |
421 if (uscf->host.len == host->len | |
2285 | 422 && ((uscf->port == 0 && u->resolved->no_port) |
1912 | 423 || uscf->port == u->resolved->port) |
1658 | 424 && ngx_memcmp(uscf->host.data, host->data, host->len) == 0) |
425 { | |
426 goto found; | |
427 } | |
428 } | |
429 | |
430 temp.name = *host; | |
431 | |
432 ctx = ngx_resolve_start(clcf->resolver, &temp); | |
433 if (ctx == NULL) { | |
434 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); | |
435 return; | |
436 } | |
437 | |
1683
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
438 if (ctx == NGX_NO_RESOLVER) { |
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
439 ngx_log_error(NGX_LOG_ERR, c->log, 0, |
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
440 "no resolver defined to resolve %V", host); |
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
441 |
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
442 ngx_http_finalize_request(r, NGX_HTTP_BAD_GATEWAY); |
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
443 return; |
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
444 } |
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
445 |
1658 | 446 ctx->name = *host; |
447 ctx->type = NGX_RESOLVE_A; | |
448 ctx->handler = ngx_http_upstream_resolve_handler; | |
449 ctx->data = r; | |
450 ctx->timeout = clcf->resolver_timeout; | |
451 | |
1959
4f16186f5603
quick resolving handles u->resolved->ctx by itself
Igor Sysoev <igor@sysoev.ru>
parents:
1958
diff
changeset
|
452 u->resolved->ctx = ctx; |
4f16186f5603
quick resolving handles u->resolved->ctx by itself
Igor Sysoev <igor@sysoev.ru>
parents:
1958
diff
changeset
|
453 |
1658 | 454 if (ngx_resolve_name(ctx) != NGX_OK) { |
1959
4f16186f5603
quick resolving handles u->resolved->ctx by itself
Igor Sysoev <igor@sysoev.ru>
parents:
1958
diff
changeset
|
455 u->resolved->ctx = NULL; |
1658 | 456 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); |
457 return; | |
458 } | |
459 | |
460 return; | |
461 } | |
462 | |
463 found: | |
464 | |
465 if (uscf->peer.init(r, uscf) != NGX_OK) { | |
466 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); | |
467 return; | |
468 } | |
469 | |
479 | 470 ngx_http_upstream_connect(r, u); |
471 } | |
472 | |
473 | |
487 | 474 static void |
1658 | 475 ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx) |
476 { | |
477 ngx_http_request_t *r; | |
478 ngx_http_upstream_resolved_t *ur; | |
479 | |
480 r = ctx->data; | |
481 | |
482 r->upstream->resolved->ctx = NULL; | |
483 | |
484 if (ctx->state) { | |
485 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
486 "%V could not be resolved (%i: %s)", | |
487 &ctx->name, ctx->state, | |
488 ngx_resolver_strerror(ctx->state)); | |
489 | |
490 ngx_resolve_name_done(ctx); | |
491 ngx_http_finalize_request(r, NGX_HTTP_BAD_GATEWAY); | |
492 return; | |
493 } | |
494 | |
495 ur = r->upstream->resolved; | |
496 ur->naddrs = ctx->naddrs; | |
497 ur->addrs = ctx->addrs; | |
498 | |
499 #if (NGX_DEBUG) | |
500 { | |
501 in_addr_t addr; | |
502 ngx_uint_t i; | |
503 | |
504 for (i = 0; i < ctx->naddrs; i++) { | |
505 addr = ntohl(ur->addrs[i]); | |
506 | |
507 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
508 "name was resolved to %ud.%ud.%ud.%ud", | |
509 (addr >> 24) & 0xff, (addr >> 16) & 0xff, | |
510 (addr >> 8) & 0xff, addr & 0xff); | |
511 } | |
512 } | |
513 #endif | |
514 | |
515 if (ngx_http_upstream_create_round_robin_peer(r, ur) != NGX_OK) { | |
516 ngx_resolve_name_done(ctx); | |
517 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); | |
518 return; | |
519 } | |
520 | |
521 ngx_resolve_name_done(ctx); | |
522 | |
523 ngx_http_upstream_connect(r, r->upstream); | |
524 } | |
525 | |
526 | |
527 static void | |
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
528 ngx_http_upstream_handler(ngx_event_t *ev) |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
529 { |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
530 ngx_connection_t *c; |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
531 ngx_http_request_t *r; |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
532 ngx_http_log_ctx_t *ctx; |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
533 ngx_http_upstream_t *u; |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
534 |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
535 c = ev->data; |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
536 r = c->data; |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
537 |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
538 u = r->upstream; |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
539 c = r->connection; |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
540 |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
541 ctx = c->log->data; |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
542 ctx->current_request = r; |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
543 |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
544 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
545 "http upstream request: \"%V?%V\"", &r->uri, &r->args); |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
546 |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
547 if (ev->write) { |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
548 u->write_event_handler(r, u); |
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
549 |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
550 } else { |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
551 u->read_event_handler(r, u); |
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
552 } |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
553 |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
554 ngx_http_run_posted_requests(c); |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
555 } |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
556 |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
557 |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
558 static void |
509 | 559 ngx_http_upstream_rd_check_broken_connection(ngx_http_request_t *r) |
560 { | |
561 ngx_http_upstream_check_broken_connection(r, r->connection->read); | |
562 } | |
563 | |
564 | |
565 static void | |
566 ngx_http_upstream_wr_check_broken_connection(ngx_http_request_t *r) | |
567 { | |
568 ngx_http_upstream_check_broken_connection(r, r->connection->write); | |
569 } | |
570 | |
571 | |
572 static void | |
573 ngx_http_upstream_check_broken_connection(ngx_http_request_t *r, | |
574 ngx_event_t *ev) | |
479 | 575 { |
576 int n; | |
577 char buf[1]; | |
577 | 578 ngx_err_t err; |
479 | 579 ngx_connection_t *c; |
580 ngx_http_upstream_t *u; | |
581 | |
527 | 582 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ev->log, 0, |
583 "http upstream check client, write event:%d, \"%V\"", | |
584 ev->write, &r->uri); | |
479 | 585 |
509 | 586 c = r->connection; |
483 | 587 u = r->upstream; |
588 | |
583 | 589 if (c->error) { |
527 | 590 ngx_http_upstream_finalize_request(r, u, |
591 NGX_HTTP_CLIENT_CLOSED_REQUEST); | |
592 return; | |
593 } | |
594 | |
483 | 595 if (u->peer.connection == NULL) { |
596 return; | |
597 } | |
598 | |
479 | 599 #if (NGX_HAVE_KQUEUE) |
600 | |
601 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { | |
602 | |
603 if (!ev->pending_eof) { | |
604 return; | |
605 } | |
606 | |
607 ev->eof = 1; | |
583 | 608 c->error = 1; |
479 | 609 |
610 if (ev->kq_errno) { | |
611 ev->error = 1; | |
612 } | |
613 | |
1565 | 614 if (!u->cacheable && !u->store && u->peer.connection) { |
479 | 615 ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno, |
527 | 616 "kevent() reported that client closed prematurely " |
617 "connection, so upstream connection is closed too"); | |
479 | 618 ngx_http_upstream_finalize_request(r, u, |
619 NGX_HTTP_CLIENT_CLOSED_REQUEST); | |
620 return; | |
621 } | |
622 | |
623 ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno, | |
624 "kevent() reported that client closed " | |
625 "prematurely connection"); | |
626 | |
627 if (u->peer.connection == NULL) { | |
628 ngx_http_upstream_finalize_request(r, u, | |
629 NGX_HTTP_CLIENT_CLOSED_REQUEST); | |
630 return; | |
631 } | |
632 | |
633 return; | |
634 } | |
635 | |
636 #endif | |
637 | |
638 n = recv(c->fd, buf, 1, MSG_PEEK); | |
639 | |
640 err = ngx_socket_errno; | |
641 | |
1109 | 642 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, err, |
643 "http upstream recv(): %d", n); | |
644 | |
479 | 645 /* |
646 * we do not need to disable the write event because | |
647 * that event has NGX_USE_CLEAR_EVENT type | |
648 */ | |
649 | |
650 if (ev->write && (n >= 0 || err == NGX_EAGAIN)) { | |
651 return; | |
652 } | |
653 | |
654 if ((ngx_event_flags & NGX_USE_LEVEL_EVENT) && ev->active) { | |
655 if (ngx_del_event(ev, NGX_READ_EVENT, 0) == NGX_ERROR) { | |
656 ngx_http_upstream_finalize_request(r, u, | |
657 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
658 return; | |
659 } | |
660 } | |
661 | |
662 if (n > 0) { | |
663 return; | |
664 } | |
665 | |
666 if (n == -1) { | |
667 if (err == NGX_EAGAIN) { | |
668 return; | |
669 } | |
670 | |
671 ev->error = 1; | |
672 | |
483 | 673 } else { /* n == 0 */ |
479 | 674 err = 0; |
675 } | |
676 | |
529 | 677 ev->eof = 1; |
583 | 678 c->error = 1; |
529 | 679 |
1565 | 680 if (!u->cacheable && !u->store && u->peer.connection) { |
479 | 681 ngx_log_error(NGX_LOG_INFO, ev->log, err, |
682 "client closed prematurely connection, " | |
683 "so upstream connection is closed too"); | |
684 ngx_http_upstream_finalize_request(r, u, | |
685 NGX_HTTP_CLIENT_CLOSED_REQUEST); | |
686 return; | |
687 } | |
688 | |
689 ngx_log_error(NGX_LOG_INFO, ev->log, err, | |
690 "client closed prematurely connection"); | |
691 | |
692 if (u->peer.connection == NULL) { | |
693 ngx_http_upstream_finalize_request(r, u, | |
694 NGX_HTTP_CLIENT_CLOSED_REQUEST); | |
695 return; | |
696 } | |
697 } | |
698 | |
699 | |
487 | 700 static void |
701 ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u) | |
479 | 702 { |
591 | 703 ngx_int_t rc; |
665 | 704 ngx_time_t *tp; |
591 | 705 ngx_connection_t *c; |
479 | 706 |
483 | 707 r->connection->log->action = "connecting to upstream"; |
479 | 708 |
709 r->connection->single_connection = 0; | |
710 | |
889
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
711 if (u->state && u->state->response_sec) { |
665 | 712 tp = ngx_timeofday(); |
889
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
713 u->state->response_sec = tp->sec - u->state->response_sec; |
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
714 u->state->response_msec = tp->msec - u->state->response_msec; |
665 | 715 } |
716 | |
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
717 u->state = ngx_array_push(r->upstream_states); |
665 | 718 if (u->state == NULL) { |
719 ngx_http_upstream_finalize_request(r, u, | |
720 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
721 return; | |
722 } | |
723 | |
724 ngx_memzero(u->state, sizeof(ngx_http_upstream_state_t)); | |
725 | |
726 tp = ngx_timeofday(); | |
889
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
727 u->state->response_sec = tp->sec; |
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
728 u->state->response_msec = tp->msec; |
665 | 729 |
479 | 730 rc = ngx_event_connect_peer(&u->peer); |
731 | |
732 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
733 "http upstream connect: %i", rc); | |
734 | |
735 if (rc == NGX_ERROR) { | |
736 ngx_http_upstream_finalize_request(r, u, | |
737 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
738 return; | |
739 } | |
740 | |
1707
f3188f6eae1f
$upstream_addr did not contain last address, the bug was introduced in r1659
Igor Sysoev <igor@sysoev.ru>
parents:
1706
diff
changeset
|
741 u->state->peer = u->peer.name; |
f3188f6eae1f
$upstream_addr did not contain last address, the bug was introduced in r1659
Igor Sysoev <igor@sysoev.ru>
parents:
1706
diff
changeset
|
742 |
543 | 743 if (rc == NGX_BUSY) { |
744 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "no live upstreams"); | |
1378 | 745 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_NOLIVE); |
746 return; | |
543 | 747 } |
748 | |
1378 | 749 if (rc == NGX_DECLINED) { |
479 | 750 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); |
751 return; | |
752 } | |
753 | |
577 | 754 /* rc == NGX_OK || rc == NGX_AGAIN */ |
755 | |
479 | 756 c = u->peer.connection; |
757 | |
758 c->data = r; | |
591 | 759 |
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
760 c->write->handler = ngx_http_upstream_handler; |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
761 c->read->handler = ngx_http_upstream_handler; |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
762 |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
763 u->write_event_handler = ngx_http_upstream_send_request_handler; |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
764 u->read_event_handler = ngx_http_upstream_process_header; |
479 | 765 |
1397
6c25a49e548a
upstream sendfile bit was overridden by r->connection->sendfile
Igor Sysoev <igor@sysoev.ru>
parents:
1378
diff
changeset
|
766 c->sendfile &= r->connection->sendfile; |
1958 | 767 u->output.sendfile = c->sendfile; |
479 | 768 |
769 c->pool = r->pool; | |
770 c->read->log = c->write->log = c->log = r->connection->log; | |
771 | |
772 /* init or reinit the ngx_output_chain() and ngx_chain_writer() contexts */ | |
773 | |
774 u->writer.out = NULL; | |
775 u->writer.last = &u->writer.out; | |
776 u->writer.connection = c; | |
777 u->writer.limit = 0; | |
778 | |
779 if (u->request_sent) { | |
509 | 780 if (ngx_http_upstream_reinit(r, u) != NGX_OK) { |
781 ngx_http_upstream_finalize_request(r, u, | |
782 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
783 return; | |
784 } | |
479 | 785 } |
786 | |
1064
7c84c877f2d7
fix segfault when client_body_in_file_only is on, the body is not passed
Igor Sysoev <igor@sysoev.ru>
parents:
1063
diff
changeset
|
787 if (r->request_body |
7c84c877f2d7
fix segfault when client_body_in_file_only is on, the body is not passed
Igor Sysoev <igor@sysoev.ru>
parents:
1063
diff
changeset
|
788 && r->request_body->buf |
7c84c877f2d7
fix segfault when client_body_in_file_only is on, the body is not passed
Igor Sysoev <igor@sysoev.ru>
parents:
1063
diff
changeset
|
789 && r->request_body->temp_file |
7c84c877f2d7
fix segfault when client_body_in_file_only is on, the body is not passed
Igor Sysoev <igor@sysoev.ru>
parents:
1063
diff
changeset
|
790 && r == r->main) |
7c84c877f2d7
fix segfault when client_body_in_file_only is on, the body is not passed
Igor Sysoev <igor@sysoev.ru>
parents:
1063
diff
changeset
|
791 { |
573 | 792 /* |
793 * the r->request_body->buf can be reused for one request only, | |
794 * the subrequests should allocate their own temporay bufs | |
795 */ | |
796 | |
797 u->output.free = ngx_alloc_chain_link(r->pool); | |
798 if (u->output.free == NULL) { | |
799 ngx_http_upstream_finalize_request(r, u, | |
800 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
801 return; | |
479 | 802 } |
573 | 803 |
804 u->output.free->buf = r->request_body->buf; | |
805 u->output.free->next = NULL; | |
806 u->output.allocated = 1; | |
807 | |
808 r->request_body->buf->pos = r->request_body->buf->start; | |
809 r->request_body->buf->last = r->request_body->buf->start; | |
810 r->request_body->buf->tag = u->output.tag; | |
479 | 811 } |
812 | |
813 u->request_sent = 0; | |
814 | |
815 if (rc == NGX_AGAIN) { | |
816 ngx_add_timer(c->write, u->conf->connect_timeout); | |
817 return; | |
818 } | |
819 | |
577 | 820 #if (NGX_HTTP_SSL) |
821 | |
1658 | 822 if (u->ssl && c->ssl == NULL) { |
591 | 823 ngx_http_upstream_ssl_init_connection(r, u, c); |
577 | 824 return; |
825 } | |
826 | |
827 #endif | |
828 | |
479 | 829 ngx_http_upstream_send_request(r, u); |
830 } | |
831 | |
832 | |
577 | 833 #if (NGX_HTTP_SSL) |
834 | |
835 static void | |
591 | 836 ngx_http_upstream_ssl_init_connection(ngx_http_request_t *r, |
837 ngx_http_upstream_t *u, ngx_connection_t *c) | |
838 { | |
884 | 839 ngx_int_t rc; |
591 | 840 |
841 if (ngx_ssl_create_connection(u->conf->ssl, c, | |
842 NGX_SSL_BUFFER|NGX_SSL_CLIENT) | |
843 == NGX_ERROR) | |
844 { | |
845 ngx_http_upstream_finalize_request(r, u, | |
846 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
847 return; | |
848 } | |
849 | |
850 c->sendfile = 0; | |
619 | 851 u->output.sendfile = 0; |
591 | 852 |
2184 | 853 if (u->conf->ssl_session_reuse) { |
854 if (u->peer.set_session(&u->peer, u->peer.data) != NGX_OK) { | |
855 ngx_http_upstream_finalize_request(r, u, | |
856 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
857 return; | |
858 } | |
591 | 859 } |
860 | |
641 | 861 r->connection->log->action = "SSL handshaking to upstream"; |
862 | |
591 | 863 rc = ngx_ssl_handshake(c); |
864 | |
865 if (rc == NGX_AGAIN) { | |
866 c->ssl->handler = ngx_http_upstream_ssl_handshake; | |
867 return; | |
868 } | |
869 | |
870 ngx_http_upstream_ssl_handshake(c); | |
871 } | |
872 | |
873 | |
874 static void | |
577 | 875 ngx_http_upstream_ssl_handshake(ngx_connection_t *c) |
876 { | |
877 ngx_http_request_t *r; | |
878 ngx_http_upstream_t *u; | |
879 | |
880 r = c->data; | |
881 u = r->upstream; | |
882 | |
883 if (c->ssl->handshaked) { | |
884 | |
2184 | 885 if (u->conf->ssl_session_reuse) { |
886 u->peer.save_session(&u->peer, u->peer.data); | |
887 } | |
884 | 888 |
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
889 c->write->handler = ngx_http_upstream_handler; |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
890 c->read->handler = ngx_http_upstream_handler; |
577 | 891 |
892 ngx_http_upstream_send_request(r, u); | |
893 | |
894 return; | |
895 } | |
896 | |
897 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); | |
898 | |
899 } | |
900 | |
901 #endif | |
902 | |
903 | |
509 | 904 static ngx_int_t |
487 | 905 ngx_http_upstream_reinit(ngx_http_request_t *r, ngx_http_upstream_t *u) |
479 | 906 { |
907 ngx_chain_t *cl; | |
908 | |
509 | 909 if (u->reinit_request(r) != NGX_OK) { |
910 return NGX_ERROR; | |
911 } | |
912 | |
1705 | 913 ngx_memzero(&u->headers_in, sizeof(ngx_http_upstream_headers_in_t)); |
914 | |
915 if (ngx_list_init(&u->headers_in.headers, r->pool, 8, | |
591 | 916 sizeof(ngx_table_elt_t)) |
917 != NGX_OK) | |
509 | 918 { |
919 return NGX_ERROR; | |
479 | 920 } |
921 | |
922 /* reinit the request chain */ | |
577 | 923 |
509 | 924 for (cl = u->request_bufs; cl; cl = cl->next) { |
479 | 925 cl->buf->pos = cl->buf->start; |
926 cl->buf->file_pos = 0; | |
927 } | |
928 | |
509 | 929 /* reinit the subrequest's ngx_output_chain() context */ |
930 | |
573 | 931 if (r->request_body && r->request_body->temp_file |
597 | 932 && r != r->main && u->output.buf) |
573 | 933 { |
934 u->output.free = ngx_alloc_chain_link(r->pool); | |
935 if (u->output.free == NULL) { | |
936 return NGX_ERROR; | |
509 | 937 } |
573 | 938 |
939 u->output.free->buf = u->output.buf; | |
940 u->output.free->next = NULL; | |
941 | |
942 u->output.buf->pos = u->output.buf->start; | |
943 u->output.buf->last = u->output.buf->start; | |
509 | 944 } |
479 | 945 |
946 u->output.buf = NULL; | |
947 u->output.in = NULL; | |
948 u->output.busy = NULL; | |
577 | 949 |
581 | 950 /* reinit u->buffer */ |
577 | 951 |
479 | 952 #if 0 |
953 if (u->cache) { | |
581 | 954 u->buffer.pos = u->buffer.start + u->cache->ctx.header_size; |
955 u->buffer.last = u->buffer.pos; | |
479 | 956 |
957 } else { | |
581 | 958 u->buffer.pos = u->buffer.start; |
959 u->buffer.last = u->buffer.start; | |
479 | 960 } |
961 #else | |
509 | 962 |
581 | 963 u->buffer.pos = u->buffer.start; |
964 u->buffer.last = u->buffer.start; | |
509 | 965 |
479 | 966 #endif |
967 | |
509 | 968 return NGX_OK; |
479 | 969 } |
970 | |
971 | |
487 | 972 static void |
973 ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u) | |
479 | 974 { |
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
975 ngx_int_t rc; |
483 | 976 ngx_connection_t *c; |
577 | 977 |
479 | 978 c = u->peer.connection; |
979 | |
980 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, | |
981 "http upstream send request"); | |
982 | |
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
983 if (!u->request_sent && ngx_http_upstream_test_connect(c) != NGX_OK) { |
1166 | 984 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); |
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
985 return; |
479 | 986 } |
987 | |
483 | 988 c->log->action = "sending request to upstream"; |
479 | 989 |
509 | 990 rc = ngx_output_chain(&u->output, u->request_sent ? NULL : u->request_bufs); |
479 | 991 |
992 u->request_sent = 1; | |
993 | |
994 if (rc == NGX_ERROR) { | |
995 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); | |
996 return; | |
997 } | |
998 | |
999 if (c->write->timer_set) { | |
1000 ngx_del_timer(c->write); | |
1001 } | |
1002 | |
1003 if (rc == NGX_AGAIN) { | |
1004 ngx_add_timer(c->write, u->conf->send_timeout); | |
1005 | |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1006 if (ngx_handle_write_event(c->write, u->conf->send_lowat) != NGX_OK) { |
479 | 1007 ngx_http_upstream_finalize_request(r, u, |
1008 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
1009 return; | |
1010 } | |
1011 | |
1012 return; | |
1013 } | |
1014 | |
1015 /* rc == NGX_OK */ | |
1016 | |
1017 if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) { | |
1018 if (ngx_tcp_push(c->fd) == NGX_ERROR) { | |
1019 ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno, | |
1020 ngx_tcp_push_n " failed"); | |
1021 ngx_http_upstream_finalize_request(r, u, | |
1022 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
577 | 1023 return; |
479 | 1024 } |
1025 | |
1026 c->tcp_nopush = NGX_TCP_NOPUSH_UNSET; | |
1027 } | |
577 | 1028 |
479 | 1029 ngx_add_timer(c->read, u->conf->read_timeout); |
1030 | |
1031 #if 1 | |
1032 if (c->read->ready) { | |
577 | 1033 |
479 | 1034 /* post aio operation */ |
1035 | |
1036 /* | |
1037 * TODO comment | |
1038 * although we can post aio operation just in the end | |
1039 * of ngx_http_upstream_connect() CHECK IT !!! | |
1040 * it's better to do here because we postpone header buffer allocation | |
1041 */ | |
1042 | |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1043 ngx_http_upstream_process_header(r, u); |
479 | 1044 return; |
1045 } | |
1046 #endif | |
1047 | |
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1048 u->write_event_handler = ngx_http_upstream_dummy_handler; |
479 | 1049 |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1050 if (ngx_handle_write_event(c->write, 0) != NGX_OK) { |
479 | 1051 ngx_http_upstream_finalize_request(r, u, |
1052 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
1053 return; | |
1054 } | |
1055 } | |
1056 | |
1057 | |
487 | 1058 static void |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1059 ngx_http_upstream_send_request_handler(ngx_http_request_t *r, |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1060 ngx_http_upstream_t *u) |
479 | 1061 { |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1062 ngx_connection_t *c; |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1063 |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1064 c = u->peer.connection; |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1065 |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1066 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
479 | 1067 "http upstream send request handler"); |
1068 | |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1069 if (c->write->timedout) { |
479 | 1070 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT); |
1071 return; | |
1072 } | |
1073 | |
591 | 1074 #if (NGX_HTTP_SSL) |
1075 | |
1658 | 1076 if (u->ssl && c->ssl == NULL) { |
591 | 1077 ngx_http_upstream_ssl_init_connection(r, u, c); |
1078 return; | |
1079 } | |
1080 | |
1081 #endif | |
1082 | |
651 | 1083 if (u->header_sent) { |
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1084 u->write_event_handler = ngx_http_upstream_dummy_handler; |
651 | 1085 |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1086 (void) ngx_handle_write_event(c->write, 0); |
651 | 1087 |
1088 return; | |
1089 } | |
1090 | |
479 | 1091 ngx_http_upstream_send_request(r, u); |
1092 } | |
1093 | |
1094 | |
487 | 1095 static void |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1096 ngx_http_upstream_process_header(ngx_http_request_t *r, ngx_http_upstream_t *u) |
479 | 1097 { |
515 | 1098 ssize_t n; |
1099 ngx_int_t rc; | |
573 | 1100 ngx_str_t *uri, args; |
649 | 1101 ngx_uint_t i, flags; |
515 | 1102 ngx_list_part_t *part; |
1103 ngx_table_elt_t *h; | |
1104 ngx_connection_t *c; | |
1105 ngx_http_upstream_header_t *hh; | |
1106 ngx_http_upstream_main_conf_t *umcf; | |
479 | 1107 |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1108 c = u->peer.connection; |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1109 |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1110 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, |
483 | 1111 "http upstream process header"); |
479 | 1112 |
483 | 1113 c->log->action = "reading response header from upstream"; |
479 | 1114 |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1115 if (c->read->timedout) { |
479 | 1116 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT); |
1117 return; | |
1118 } | |
577 | 1119 |
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1120 if (!u->request_sent && ngx_http_upstream_test_connect(c) != NGX_OK) { |
1166 | 1121 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); |
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1122 return; |
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1123 } |
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1124 |
581 | 1125 if (u->buffer.start == NULL) { |
1126 u->buffer.start = ngx_palloc(r->pool, u->conf->buffer_size); | |
1127 if (u->buffer.start == NULL) { | |
479 | 1128 ngx_http_upstream_finalize_request(r, u, |
1129 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
1130 return; | |
1131 } | |
1132 | |
581 | 1133 u->buffer.pos = u->buffer.start; |
1134 u->buffer.last = u->buffer.start; | |
1135 u->buffer.end = u->buffer.start + u->conf->buffer_size; | |
1136 u->buffer.temporary = 1; | |
1137 | |
1138 u->buffer.tag = u->output.tag; | |
479 | 1139 |
1705 | 1140 if (ngx_list_init(&u->headers_in.headers, r->pool, 8, |
581 | 1141 sizeof(ngx_table_elt_t)) |
1142 != NGX_OK) | |
509 | 1143 { |
1144 ngx_http_upstream_finalize_request(r, u, | |
1145 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
1146 return; | |
1147 } | |
1148 | |
479 | 1149 #if 0 |
1150 if (u->cache) { | |
581 | 1151 u->buffer.pos += u->cache->ctx.header_size; |
1152 u->buffer.last = u->buffer.pos; | |
479 | 1153 } |
1154 #endif | |
1155 } | |
1156 | |
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1157 for ( ;; ) { |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1158 |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1159 n = c->recv(c, u->buffer.last, u->buffer.end - u->buffer.last); |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1160 |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1161 if (n == NGX_AGAIN) { |
479 | 1162 #if 0 |
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1163 ngx_add_timer(rev, u->read_timeout); |
479 | 1164 #endif |
1165 | |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1166 if (ngx_handle_read_event(c->read, 0) != NGX_OK) { |
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1167 ngx_http_upstream_finalize_request(r, u, |
479 | 1168 NGX_HTTP_INTERNAL_SERVER_ERROR); |
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1169 return; |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1170 } |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1171 |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1172 return; |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1173 } |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1174 |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1175 if (n == 0) { |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1176 ngx_log_error(NGX_LOG_ERR, c->log, 0, |
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1177 "upstream prematurely closed connection"); |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1178 } |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1179 |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1180 if (n == NGX_ERROR || n == 0) { |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1181 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); |
479 | 1182 return; |
1183 } | |
1184 | |
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1185 u->buffer.last += n; |
479 | 1186 |
1187 #if 0 | |
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1188 u->valid_header_in = 0; |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1189 |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1190 u->peer.cached = 0; |
479 | 1191 #endif |
1192 | |
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1193 rc = u->process_header(r); |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1194 |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1195 if (rc == NGX_AGAIN) { |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1196 |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1197 if (u->buffer.pos == u->buffer.end) { |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1198 ngx_log_error(NGX_LOG_ERR, c->log, 0, |
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1199 "upstream sent too big header"); |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1200 |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1201 ngx_http_upstream_next(r, u, |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1202 NGX_HTTP_UPSTREAM_FT_INVALID_HEADER); |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1203 return; |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1204 } |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1205 |
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1206 continue; |
479 | 1207 } |
1208 | |
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1209 break; |
479 | 1210 } |
1211 | |
1212 if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) { | |
1213 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_INVALID_HEADER); | |
1214 return; | |
1215 } | |
1216 | |
1699
976db8c6fb64
return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR in u->parse_header()
Igor Sysoev <igor@sysoev.ru>
parents:
1693
diff
changeset
|
1217 if (rc == NGX_ERROR) { |
479 | 1218 ngx_http_upstream_finalize_request(r, u, |
1219 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
1220 return; | |
1221 } | |
1222 | |
1223 /* rc == NGX_OK */ | |
1224 | |
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1225 if (u->headers_in.status_n >= NGX_HTTP_BAD_REQUEST) { |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1226 |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1227 if (r->subrequest_in_memory) { |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1228 u->buffer.last = u->buffer.pos; |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1229 } |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1230 |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1231 if (ngx_http_upstream_test_next(r, u) == NGX_OK) { |
509 | 1232 return; |
1233 } | |
1234 | |
2267
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1235 if (ngx_http_upstream_intercept_errors(r, u) == NGX_OK) { |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1236 return; |
487 | 1237 } |
1238 } | |
1239 | |
681 | 1240 umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module); |
1241 | |
1705 | 1242 if (u->headers_in.x_accel_redirect) { |
757
a138c4e6031f
not do ngx_http_upstream_finalize_request() twice
Igor Sysoev <igor@sysoev.ru>
parents:
756
diff
changeset
|
1243 |
515 | 1244 ngx_http_upstream_finalize_request(r, u, NGX_DECLINED); |
1245 | |
1705 | 1246 part = &u->headers_in.headers.part; |
515 | 1247 h = part->elts; |
1248 | |
1249 for (i = 0; /* void */; i++) { | |
1250 | |
1251 if (i >= part->nelts) { | |
1252 if (part->next == NULL) { | |
1253 break; | |
1254 } | |
577 | 1255 |
515 | 1256 part = part->next; |
1257 h = part->elts; | |
1258 i = 0; | |
1259 } | |
1260 | |
649 | 1261 hh = ngx_hash_find(&umcf->headers_in_hash, h[i].hash, |
1262 h[i].lowcase_key, h[i].key.len); | |
1263 | |
1264 if (hh && hh->redirect) { | |
1265 if (hh->copy_handler(r, &h[i], hh->conf) != NGX_OK) { | |
787
b310630d129e
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
777
diff
changeset
|
1266 ngx_http_finalize_request(r, |
757
a138c4e6031f
not do ngx_http_upstream_finalize_request() twice
Igor Sysoev <igor@sysoev.ru>
parents:
756
diff
changeset
|
1267 NGX_HTTP_INTERNAL_SERVER_ERROR); |
515 | 1268 return; |
1269 } | |
1270 } | |
1271 } | |
1272 | |
1705 | 1273 uri = &u->headers_in.x_accel_redirect->value; |
573 | 1274 args.len = 0; |
1275 args.data = NULL; | |
1276 flags = 0; | |
1277 | |
1278 if (ngx_http_parse_unsafe_uri(r, uri, &args, &flags) != NGX_OK) { | |
757
a138c4e6031f
not do ngx_http_upstream_finalize_request() twice
Igor Sysoev <igor@sysoev.ru>
parents:
756
diff
changeset
|
1279 ngx_http_finalize_request(r, NGX_HTTP_NOT_FOUND); |
573 | 1280 return; |
1281 } | |
1282 | |
1283 if (flags & NGX_HTTP_ZERO_IN_URI) { | |
1284 r->zero_in_uri = 1; | |
1285 } | |
1286 | |
653 | 1287 if (r->method != NGX_HTTP_HEAD) { |
1288 r->method = NGX_HTTP_GET; | |
1289 } | |
1290 | |
2183
4a5bfd728a12
disable original URI usage in proxy_pass after X-Accel-Redirect
Igor Sysoev <igor@sysoev.ru>
parents:
2140
diff
changeset
|
1291 r->valid_unparsed_uri = 0; |
4a5bfd728a12
disable original URI usage in proxy_pass after X-Accel-Redirect
Igor Sysoev <igor@sysoev.ru>
parents:
2140
diff
changeset
|
1292 |
573 | 1293 ngx_http_internal_redirect(r, uri, &args); |
515 | 1294 return; |
1295 } | |
1296 | |
1705 | 1297 part = &u->headers_in.headers.part; |
509 | 1298 h = part->elts; |
1299 | |
1300 for (i = 0; /* void */; i++) { | |
479 | 1301 |
509 | 1302 if (i >= part->nelts) { |
1303 if (part->next == NULL) { | |
1304 break; | |
1305 } | |
577 | 1306 |
509 | 1307 part = part->next; |
1308 h = part->elts; | |
1309 i = 0; | |
1310 } | |
1311 | |
649 | 1312 if (ngx_hash_find(&u->conf->hide_headers_hash, h[i].hash, |
1313 h[i].lowcase_key, h[i].key.len)) | |
509 | 1314 { |
649 | 1315 continue; |
1316 } | |
1317 | |
1318 hh = ngx_hash_find(&umcf->headers_in_hash, h[i].hash, | |
1319 h[i].lowcase_key, h[i].key.len); | |
1320 | |
1321 if (hh) { | |
1322 if (hh->copy_handler(r, &h[i], hh->conf) != NGX_OK) { | |
509 | 1323 ngx_http_upstream_finalize_request(r, u, |
1324 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
1325 return; | |
1326 } | |
1327 | |
1328 continue; | |
1329 } | |
1330 | |
1331 if (ngx_http_upstream_copy_header_line(r, &h[i], 0) != NGX_OK) { | |
1332 ngx_http_upstream_finalize_request(r, u, | |
1333 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
1334 return; | |
1335 } | |
1336 } | |
1337 | |
649 | 1338 if (r->headers_out.server && r->headers_out.server->value.data == NULL) { |
1339 r->headers_out.server->hash = 0; | |
1340 } | |
1341 | |
1342 if (r->headers_out.date && r->headers_out.date->value.data == NULL) { | |
1343 r->headers_out.date->hash = 0; | |
1344 } | |
1345 | |
529 | 1346 r->headers_out.status = u->headers_in.status_n; |
1347 r->headers_out.status_line = u->headers_in.status_line; | |
1348 | |
1885
e5897822515f
test response length in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1777
diff
changeset
|
1349 u->headers_in.content_length_n = r->headers_out.content_length_n; |
e5897822515f
test response length in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1777
diff
changeset
|
1350 |
581 | 1351 if (r->headers_out.content_length_n != -1) { |
1352 u->length = (size_t) r->headers_out.content_length_n; | |
1353 | |
1354 } else { | |
1355 u->length = NGX_MAX_SIZE_T_VALUE; | |
1356 } | |
1357 | |
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1358 if (!r->subrequest_in_memory) { |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1359 ngx_http_upstream_send_response(r, u); |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1360 return; |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1361 } |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1362 |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1363 /* subrequest content in memory */ |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1364 |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1365 if (u->input_filter == NULL) { |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1366 u->input_filter_init = ngx_http_upstream_non_buffered_filter_init; |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1367 u->input_filter = ngx_http_upstream_non_buffered_filter; |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1368 u->input_filter_ctx = r; |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1369 } |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1370 |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1371 if (u->input_filter_init(u->input_filter_ctx) == NGX_ERROR) { |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1372 ngx_http_upstream_finalize_request(r, u, |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1373 NGX_HTTP_INTERNAL_SERVER_ERROR); |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1374 return; |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1375 } |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1376 |
2308
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1377 n = u->buffer.last - u->buffer.pos; |
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1378 |
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1379 if (n) { |
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1380 u->buffer.last -= n; |
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1381 |
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1382 if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) { |
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1383 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1384 return; |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1385 } |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1386 |
2308
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1387 if (u->length == 0) { |
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1388 ngx_http_upstream_finalize_request(r, u, 0); |
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1389 return; |
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1390 } |
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1391 } |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1392 |
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1393 u->read_event_handler = ngx_http_upstream_process_body_in_memory; |
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1394 |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1395 ngx_http_upstream_process_body_in_memory(r, u); |
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1396 } |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1397 |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1398 |
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1399 static ngx_int_t |
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1400 ngx_http_upstream_test_next(ngx_http_request_t *r, ngx_http_upstream_t *u) |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1401 { |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1402 ngx_uint_t status; |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1403 ngx_http_upstream_next_t *un; |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1404 |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1405 if (!(u->conf->next_upstream & NGX_HTTP_UPSTREAM_FT_STATUS)) { |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1406 return NGX_DECLINED; |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1407 } |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1408 |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1409 status = u->headers_in.status_n; |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1410 |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1411 for (un = ngx_http_upstream_next_errors; un->status; un++) { |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1412 |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1413 if (status != un->status) { |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1414 continue; |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1415 } |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1416 |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1417 if (u->peer.tries > 1 && (u->conf->next_upstream & un->mask)) { |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1418 ngx_http_upstream_next(r, u, un->mask); |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1419 return NGX_OK; |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1420 } |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1421 |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1422 if (status == NGX_HTTP_NOT_FOUND && u->conf->intercept_404) { |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1423 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_NOT_FOUND); |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1424 return NGX_OK; |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1425 } |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1426 |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1427 #if (NGX_HTTP_CACHE) |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1428 |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1429 if (u->peer.tries == 0 && u->stale && (u->conf->use_stale & un->mask)) { |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1430 ngx_http_upstream_finalize_request(r, u, |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1431 ngx_http_send_cached_response(r)); |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1432 return NGX_OK; |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1433 } |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1434 |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1435 #endif |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1436 } |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1437 |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1438 return NGX_DECLINED; |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1439 } |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1440 |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1441 |
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1442 static ngx_int_t |
2267
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1443 ngx_http_upstream_intercept_errors(ngx_http_request_t *r, |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1444 ngx_http_upstream_t *u) |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1445 { |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1446 ngx_int_t status; |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1447 ngx_uint_t i; |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1448 ngx_table_elt_t *h; |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1449 ngx_http_err_page_t *err_page; |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1450 ngx_http_core_loc_conf_t *clcf; |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1451 |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1452 if (!u->conf->intercept_errors) { |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1453 return NGX_DECLINED; |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1454 } |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1455 |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1456 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1457 |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1458 if (clcf->error_pages == NULL) { |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1459 return NGX_DECLINED; |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1460 } |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1461 |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1462 status = u->headers_in.status_n; |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1463 |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1464 err_page = clcf->error_pages->elts; |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1465 for (i = 0; i < clcf->error_pages->nelts; i++) { |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1466 |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1467 if (err_page[i].status == status) { |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1468 |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1469 if (status == NGX_HTTP_UNAUTHORIZED) { |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1470 |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1471 h = ngx_list_push(&r->headers_out.headers); |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1472 |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1473 if (h == NULL) { |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1474 ngx_http_upstream_finalize_request(r, u, |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1475 NGX_HTTP_INTERNAL_SERVER_ERROR); |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1476 return NGX_OK; |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1477 } |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1478 |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1479 *h = *u->headers_in.www_authenticate; |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1480 |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1481 r->headers_out.www_authenticate = h; |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1482 } |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1483 |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1484 ngx_http_upstream_finalize_request(r, u, status); |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1485 |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1486 return NGX_OK; |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1487 } |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1488 } |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1489 |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1490 return NGX_DECLINED; |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1491 } |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1492 |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1493 |
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1494 static ngx_int_t |
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1495 ngx_http_upstream_test_connect(ngx_connection_t *c) |
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1496 { |
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1497 int err; |
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1498 socklen_t len; |
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1499 |
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1500 #if (NGX_HAVE_KQUEUE) |
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1501 |
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1502 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { |
1166 | 1503 if (c->write->pending_eof) { |
1469
0a269c464eaf
connection error should be logged with "connecting to upstream" action,
Igor Sysoev <igor@sysoev.ru>
parents:
1468
diff
changeset
|
1504 c->log->action = "connecting to upstream"; |
1166 | 1505 (void) ngx_connection_error(c, c->write->kq_errno, |
1506 "kevent() reported that connect() failed"); | |
1507 return NGX_ERROR; | |
1508 } | |
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1509 |
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1510 } else |
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1511 #endif |
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1512 { |
1166 | 1513 err = 0; |
1514 len = sizeof(int); | |
1515 | |
1516 /* | |
1517 * BSDs and Linux return 0 and set a pending error in err | |
1518 * Solaris returns -1 and sets errno | |
1519 */ | |
1520 | |
1521 if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, (void *) &err, &len) | |
1522 == -1) | |
1523 { | |
1524 err = ngx_errno; | |
1525 } | |
1526 | |
1527 if (err) { | |
1469
0a269c464eaf
connection error should be logged with "connecting to upstream" action,
Igor Sysoev <igor@sysoev.ru>
parents:
1468
diff
changeset
|
1528 c->log->action = "connecting to upstream"; |
1166 | 1529 (void) ngx_connection_error(c, err, "connect() failed"); |
1530 return NGX_ERROR; | |
1531 } | |
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1532 } |
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1533 |
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1534 return NGX_OK; |
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1535 } |
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1536 |
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1537 |
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1538 static void |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1539 ngx_http_upstream_process_body_in_memory(ngx_http_request_t *r, |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1540 ngx_http_upstream_t *u) |
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1541 { |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1542 size_t size; |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1543 ssize_t n; |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1544 ngx_buf_t *b; |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1545 ngx_event_t *rev; |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1546 ngx_connection_t *c; |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1547 |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1548 c = u->peer.connection; |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1549 rev = c->read; |
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1550 |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1551 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1552 "http upstream process body on memory"); |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1553 |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1554 if (rev->timedout) { |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1555 ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out"); |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1556 ngx_http_upstream_finalize_request(r, u, NGX_ETIMEDOUT); |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1557 return; |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1558 } |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1559 |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1560 b = &u->buffer; |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1561 |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1562 for ( ;; ) { |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1563 |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1564 size = b->end - b->last; |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1565 |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1566 if (size == 0) { |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1567 ngx_log_error(NGX_LOG_ALERT, c->log, 0, |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1568 "upstream buffer is too small to read repsonse"); |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1569 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1570 return; |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1571 } |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1572 |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1573 n = c->recv(c, b->last, size); |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1574 |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1575 if (n == NGX_AGAIN) { |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1576 break; |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1577 } |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1578 |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1579 if (n == 0 || n == NGX_ERROR) { |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1580 ngx_http_upstream_finalize_request(r, u, n); |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1581 return; |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1582 } |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1583 |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1584 if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) { |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1585 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1586 return; |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1587 } |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1588 |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1589 if (!rev->ready) { |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1590 break; |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1591 } |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1592 } |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1593 |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1594 if (ngx_handle_read_event(rev, 0) != NGX_OK) { |
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1595 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1596 return; |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1597 } |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1598 |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1599 if (rev->active) { |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1600 ngx_add_timer(rev, u->conf->read_timeout); |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1601 |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1602 } else if (rev->timer_set) { |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1603 ngx_del_timer(rev); |
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1604 } |
681 | 1605 } |
1606 | |
1607 | |
1608 static void | |
1609 ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u) | |
1610 { | |
1611 int tcp_nodelay; | |
1612 ssize_t size; | |
1613 ngx_int_t rc; | |
1614 ngx_event_pipe_t *p; | |
1615 ngx_connection_t *c; | |
1616 ngx_pool_cleanup_t *cl; | |
1617 ngx_pool_cleanup_file_t *clf; | |
1618 ngx_http_core_loc_conf_t *clcf; | |
1619 | |
509 | 1620 rc = ngx_http_send_header(r); |
479 | 1621 |
1031
bf1785dfb75f
allow the upstream modules to send a header only
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
1622 if (rc == NGX_ERROR || rc > NGX_OK || r->post_action || r->header_only) { |
485 | 1623 ngx_http_upstream_finalize_request(r, u, rc); |
479 | 1624 return; |
1625 } | |
1626 | |
1627 u->header_sent = 1; | |
1628 | |
573 | 1629 if (r->request_body && r->request_body->temp_file) { |
563 | 1630 for (cl = r->pool->cleanup; cl; cl = cl->next) { |
1631 if (cl->handler == ngx_pool_cleanup_file) { | |
1632 clf = cl->data; | |
1633 | |
1634 if (clf->fd == r->request_body->temp_file->file.fd) { | |
1635 cl->handler(clf); | |
1636 cl->handler = NULL; | |
659 | 1637 r->request_body->temp_file->file.fd = NGX_INVALID_FILE; |
563 | 1638 break; |
1639 } | |
1640 } | |
1641 } | |
1642 } | |
1643 | |
583 | 1644 c = r->connection; |
1645 | |
581 | 1646 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
1647 | |
649 | 1648 if (!u->buffering) { |
581 | 1649 |
1650 if (u->input_filter == NULL) { | |
1651 u->input_filter_init = ngx_http_upstream_non_buffered_filter_init; | |
1652 u->input_filter = ngx_http_upstream_non_buffered_filter; | |
1653 u->input_filter_ctx = r; | |
1654 } | |
1655 | |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1656 u->read_event_handler = ngx_http_upstream_process_non_buffered_upstream; |
581 | 1657 r->write_event_handler = |
1658 ngx_http_upstream_process_non_buffered_downstream; | |
1659 | |
1660 r->limit_rate = 0; | |
1661 | |
1662 if (u->input_filter_init(u->input_filter_ctx) == NGX_ERROR) { | |
1663 ngx_http_upstream_finalize_request(r, u, 0); | |
1664 return; | |
1665 } | |
1666 | |
583 | 1667 if (clcf->tcp_nodelay && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) { |
1668 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay"); | |
1669 | |
1670 tcp_nodelay = 1; | |
1671 | |
1672 if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY, | |
1673 (const void *) &tcp_nodelay, sizeof(int)) == -1) | |
1674 { | |
1675 ngx_connection_error(c, ngx_socket_errno, | |
1676 "setsockopt(TCP_NODELAY) failed"); | |
1677 ngx_http_upstream_finalize_request(r, u, 0); | |
1678 return; | |
1679 } | |
1680 | |
1681 c->tcp_nodelay = NGX_TCP_NODELAY_SET; | |
1682 } | |
1683 | |
581 | 1684 size = u->buffer.last - u->buffer.pos; |
1685 | |
1686 if (size) { | |
1687 u->buffer.last = u->buffer.pos; | |
1688 | |
1689 if (u->input_filter(u->input_filter_ctx, size) == NGX_ERROR) { | |
1690 ngx_http_upstream_finalize_request(r, u, 0); | |
1691 return; | |
1692 } | |
1693 | |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1694 ngx_http_upstream_process_non_buffered_downstream(r); |
581 | 1695 |
1696 } else { | |
1697 u->buffer.pos = u->buffer.start; | |
1698 u->buffer.last = u->buffer.start; | |
1699 | |
1700 if (ngx_http_send_special(r, NGX_HTTP_FLUSH) == NGX_ERROR) { | |
1701 ngx_http_upstream_finalize_request(r, u, 0); | |
1702 return; | |
1703 } | |
1468
491e5059ea19
read EOF of header only responses in non-buffered proxying
Igor Sysoev <igor@sysoev.ru>
parents:
1397
diff
changeset
|
1704 |
491e5059ea19
read EOF of header only responses in non-buffered proxying
Igor Sysoev <igor@sysoev.ru>
parents:
1397
diff
changeset
|
1705 if (u->peer.connection->read->ready) { |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1706 ngx_http_upstream_process_non_buffered_upstream(r, u); |
1468
491e5059ea19
read EOF of header only responses in non-buffered proxying
Igor Sysoev <igor@sysoev.ru>
parents:
1397
diff
changeset
|
1707 } |
581 | 1708 } |
1709 | |
1710 return; | |
1711 } | |
1712 | |
479 | 1713 /* TODO: preallocate event_pipe bufs, look "Content-Length" */ |
1714 | |
1715 #if 0 | |
1716 | |
1717 if (u->cache && u->cache->ctx.file.fd != NGX_INVALID_FILE) { | |
1718 if (ngx_close_file(u->cache->ctx.file.fd) == NGX_FILE_ERROR) { | |
583 | 1719 ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno, |
479 | 1720 ngx_close_file_n " \"%s\" failed", |
1721 u->cache->ctx.file.name.data); | |
1722 } | |
1723 } | |
1724 | |
1565 | 1725 if (u->cacheable) { |
581 | 1726 header = (ngx_http_cache_header_t *) u->buffer->start; |
479 | 1727 |
1728 header->expires = u->cache->ctx.expires; | |
1729 header->last_modified = u->cache->ctx.last_modified; | |
1730 header->date = u->cache->ctx.date; | |
1731 header->length = r->headers_out.content_length_n; | |
1732 u->cache->ctx.length = r->headers_out.content_length_n; | |
1733 | |
1734 header->key_len = u->cache->ctx.key0.len; | |
1735 ngx_memcpy(&header->key, u->cache->ctx.key0.data, header->key_len); | |
1736 header->key[header->key_len] = LF; | |
1737 } | |
1738 | |
1739 #endif | |
1740 | |
581 | 1741 p = u->pipe; |
479 | 1742 |
1743 p->output_filter = (ngx_event_pipe_output_filter_pt) ngx_http_output_filter; | |
1744 p->output_ctx = r; | |
1745 p->tag = u->output.tag; | |
577 | 1746 p->bufs = u->conf->bufs; |
479 | 1747 p->busy_size = u->conf->busy_buffers_size; |
1748 p->upstream = u->peer.connection; | |
583 | 1749 p->downstream = c; |
479 | 1750 p->pool = r->pool; |
583 | 1751 p->log = c->log; |
577 | 1752 |
1565 | 1753 p->cacheable = u->cacheable || u->store; |
479 | 1754 |
501 | 1755 p->temp_file = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t)); |
1756 if (p->temp_file == NULL) { | |
479 | 1757 ngx_http_upstream_finalize_request(r, u, 0); |
1758 return; | |
1759 } | |
1760 | |
1761 p->temp_file->file.fd = NGX_INVALID_FILE; | |
583 | 1762 p->temp_file->file.log = c->log; |
479 | 1763 p->temp_file->path = u->conf->temp_path; |
1764 p->temp_file->pool = r->pool; | |
577 | 1765 |
1565 | 1766 if (u->cacheable || u->store) { |
479 | 1767 p->temp_file->persistent = 1; |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
1768 |
479 | 1769 } else { |
667 | 1770 p->temp_file->log_level = NGX_LOG_WARN; |
479 | 1771 p->temp_file->warn = "an upstream response is buffered " |
1772 "to a temporary file"; | |
1773 } | |
1774 | |
1775 p->max_temp_file_size = u->conf->max_temp_file_size; | |
1776 p->temp_file_write_size = u->conf->temp_file_write_size; | |
1777 | |
501 | 1778 p->preread_bufs = ngx_alloc_chain_link(r->pool); |
1779 if (p->preread_bufs == NULL) { | |
479 | 1780 ngx_http_upstream_finalize_request(r, u, 0); |
1781 return; | |
1782 } | |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
1783 |
581 | 1784 p->preread_bufs->buf = &u->buffer; |
479 | 1785 p->preread_bufs->next = NULL; |
581 | 1786 u->buffer.recycled = 1; |
1787 | |
1788 p->preread_size = u->buffer.last - u->buffer.pos; | |
479 | 1789 |
1565 | 1790 if (u->cacheable) { |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
1791 |
479 | 1792 p->buf_to_file = ngx_calloc_buf(r->pool); |
1793 if (p->buf_to_file == NULL) { | |
1794 ngx_http_upstream_finalize_request(r, u, 0); | |
1795 return; | |
1796 } | |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
1797 |
581 | 1798 p->buf_to_file->pos = u->buffer.start; |
1799 p->buf_to_file->last = u->buffer.pos; | |
479 | 1800 p->buf_to_file->temporary = 1; |
1801 } | |
1802 | |
1803 if (ngx_event_flags & NGX_USE_AIO_EVENT) { | |
1804 /* the posted aio operation may currupt a shadow buffer */ | |
1805 p->single_buf = 1; | |
1806 } | |
1807 | |
1808 /* TODO: p->free_bufs = 0 if use ngx_create_chain_of_bufs() */ | |
1809 p->free_bufs = 1; | |
1810 | |
1811 /* | |
581 | 1812 * event_pipe would do u->buffer.last += p->preread_size |
479 | 1813 * as though these bytes were read |
1814 */ | |
581 | 1815 u->buffer.last = u->buffer.pos; |
479 | 1816 |
1817 if (u->conf->cyclic_temp_file) { | |
1818 | |
1819 /* | |
1820 * we need to disable the use of sendfile() if we use cyclic temp file | |
1821 * because the writing a new data may interfere with sendfile() | |
1822 * that uses the same kernel file pages (at least on FreeBSD) | |
1823 */ | |
1824 | |
1825 p->cyclic_temp_file = 1; | |
583 | 1826 c->sendfile = 0; |
479 | 1827 |
1828 } else { | |
1829 p->cyclic_temp_file = 0; | |
1830 } | |
1831 | |
1832 p->read_timeout = u->conf->read_timeout; | |
1833 p->send_timeout = clcf->send_timeout; | |
1834 p->send_lowat = clcf->send_lowat; | |
1835 | |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1836 u->read_event_handler = ngx_http_upstream_process_upstream; |
509 | 1837 r->write_event_handler = ngx_http_upstream_process_downstream; |
479 | 1838 |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1839 ngx_http_upstream_process_upstream(r, u); |
479 | 1840 } |
1841 | |
1842 | |
487 | 1843 static void |
581 | 1844 ngx_http_upstream_process_non_buffered_downstream(ngx_http_request_t *r) |
1845 { | |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1846 ngx_event_t *wev; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1847 ngx_connection_t *c; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1848 ngx_http_upstream_t *u; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1849 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1850 c = r->connection; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1851 u = r->upstream; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1852 wev = c->write; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1853 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1854 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1855 "http upstream process non buffered downstream"); |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1856 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1857 c->log->action = "sending to client"; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1858 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1859 if (wev->timedout) { |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1860 c->timedout = 1; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1861 ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out"); |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1862 ngx_http_upstream_finalize_request(r, u, 0); |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1863 return; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1864 } |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1865 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1866 ngx_http_upstream_process_non_buffered_request(r, 1); |
581 | 1867 } |
1868 | |
1869 | |
1870 static void | |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1871 ngx_http_upstream_process_non_buffered_upstream(ngx_http_request_t *r, |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1872 ngx_http_upstream_t *u) |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1873 { |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1874 ngx_connection_t *c; |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1875 |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1876 c = u->peer.connection; |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1877 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1878 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1879 "http upstream process non buffered upstream"); |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1880 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1881 c->log->action = "reading upstream"; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1882 |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1883 if (c->read->timedout) { |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1884 ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out"); |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1885 ngx_http_upstream_finalize_request(r, u, 0); |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1886 return; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1887 } |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1888 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1889 ngx_http_upstream_process_non_buffered_request(r, 0); |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1890 } |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1891 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1892 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1893 static void |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1894 ngx_http_upstream_process_non_buffered_request(ngx_http_request_t *r, |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1895 ngx_uint_t do_write) |
581 | 1896 { |
1897 size_t size; | |
1898 ssize_t n; | |
1899 ngx_buf_t *b; | |
583 | 1900 ngx_int_t rc; |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1901 ngx_connection_t *downstream, *upstream; |
581 | 1902 ngx_http_upstream_t *u; |
1903 ngx_http_core_loc_conf_t *clcf; | |
1904 | |
756
d904b5cb3bba
fix building introduced by previous commit
Igor Sysoev <igor@sysoev.ru>
parents:
755
diff
changeset
|
1905 u = r->upstream; |
884 | 1906 downstream = r->connection; |
1907 upstream = u->peer.connection; | |
581 | 1908 |
1909 b = &u->buffer; | |
1910 | |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1911 do_write = do_write || u->length == 0; |
581 | 1912 |
1913 for ( ;; ) { | |
1914 | |
1915 if (do_write) { | |
1916 | |
1917 if (u->out_bufs || u->busy_bufs) { | |
583 | 1918 rc = ngx_http_output_filter(r, u->out_bufs); |
1919 | |
884 | 1920 if (downstream->destroyed) { |
583 | 1921 return; |
1922 } | |
1923 | |
1924 if (rc == NGX_ERROR) { | |
581 | 1925 ngx_http_upstream_finalize_request(r, u, 0); |
1926 return; | |
1927 } | |
1928 | |
1929 ngx_chain_update_chains(&u->free_bufs, &u->busy_bufs, | |
1930 &u->out_bufs, u->output.tag); | |
1931 } | |
1932 | |
1933 if (u->busy_bufs == NULL) { | |
1934 | |
1935 if (u->length == 0 | |
884 | 1936 || upstream->read->eof |
1937 || upstream->read->error) | |
581 | 1938 { |
1939 ngx_http_upstream_finalize_request(r, u, 0); | |
1940 return; | |
1941 } | |
1942 | |
1943 b->pos = b->start; | |
1944 b->last = b->start; | |
1945 } | |
1946 } | |
1947 | |
1948 size = b->end - b->last; | |
1949 | |
1950 if (size > u->length) { | |
1951 size = u->length; | |
1952 } | |
1953 | |
884 | 1954 if (size && upstream->read->ready) { |
1955 | |
1956 n = upstream->recv(upstream, b->last, size); | |
581 | 1957 |
1958 if (n == NGX_AGAIN) { | |
1959 break; | |
1960 } | |
1961 | |
1962 if (n > 0) { | |
1963 if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) { | |
1964 ngx_http_upstream_finalize_request(r, u, 0); | |
1965 return; | |
1966 } | |
1967 } | |
1968 | |
1969 do_write = 1; | |
1970 | |
1971 continue; | |
1972 } | |
1973 | |
1974 break; | |
1975 } | |
1976 | |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1977 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
1978 |
884 | 1979 if (downstream->data == r) { |
1980 if (ngx_handle_write_event(downstream->write, clcf->send_lowat) | |
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1981 != NGX_OK) |
583 | 1982 { |
1983 ngx_http_upstream_finalize_request(r, u, 0); | |
1984 return; | |
1985 } | |
581 | 1986 } |
1987 | |
1063
e2a6ecc5a3ae
a non-active client connection must not closed after send timeout
Igor Sysoev <igor@sysoev.ru>
parents:
1031
diff
changeset
|
1988 if (downstream->write->active && !downstream->write->ready) { |
884 | 1989 ngx_add_timer(downstream->write, clcf->send_timeout); |
1990 | |
1991 } else if (downstream->write->timer_set) { | |
1992 ngx_del_timer(downstream->write); | |
581 | 1993 } |
1994 | |
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1995 if (ngx_handle_read_event(upstream->read, 0) != NGX_OK) { |
581 | 1996 ngx_http_upstream_finalize_request(r, u, 0); |
1997 return; | |
1998 } | |
1999 | |
1063
e2a6ecc5a3ae
a non-active client connection must not closed after send timeout
Igor Sysoev <igor@sysoev.ru>
parents:
1031
diff
changeset
|
2000 if (upstream->read->active && !upstream->read->ready) { |
884 | 2001 ngx_add_timer(upstream->read, u->conf->read_timeout); |
2002 | |
2003 } else if (upstream->read->timer_set) { | |
2004 ngx_del_timer(upstream->read); | |
581 | 2005 } |
2006 } | |
2007 | |
2008 | |
2009 static ngx_int_t | |
2010 ngx_http_upstream_non_buffered_filter_init(void *data) | |
2011 { | |
2012 return NGX_OK; | |
2013 } | |
2014 | |
2015 | |
2016 static ngx_int_t | |
2017 ngx_http_upstream_non_buffered_filter(void *data, ssize_t bytes) | |
2018 { | |
2019 ngx_http_request_t *r = data; | |
2020 | |
2021 ngx_buf_t *b; | |
2022 ngx_chain_t *cl, **ll; | |
2023 ngx_http_upstream_t *u; | |
2024 | |
2025 u = r->upstream; | |
2026 | |
2027 for (cl = u->out_bufs, ll = &u->out_bufs; cl; cl = cl->next) { | |
2028 ll = &cl->next; | |
2029 } | |
2030 | |
2031 cl = ngx_chain_get_free_buf(r->pool, &u->free_bufs); | |
2032 if (cl == NULL) { | |
2033 return NGX_ERROR; | |
2034 } | |
2035 | |
2036 *ll = cl; | |
2037 | |
2038 cl->buf->flush = 1; | |
2039 cl->buf->memory = 1; | |
2040 | |
2041 b = &u->buffer; | |
2042 | |
2043 cl->buf->pos = b->last; | |
2044 b->last += bytes; | |
2045 cl->buf->last = b->last; | |
1908
f2953601ed3c
fix memory leak in long-lived non buffered connections
Igor Sysoev <igor@sysoev.ru>
parents:
1902
diff
changeset
|
2046 cl->buf->tag = u->output.tag; |
581 | 2047 |
2048 if (u->length == NGX_MAX_SIZE_T_VALUE) { | |
2049 return NGX_OK; | |
2050 } | |
2051 | |
2052 u->length -= bytes; | |
2053 | |
2054 return NGX_OK; | |
2055 } | |
2056 | |
2057 | |
2058 static void | |
509 | 2059 ngx_http_upstream_process_downstream(ngx_http_request_t *r) |
2060 { | |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2061 ngx_event_t *wev; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2062 ngx_connection_t *c; |
509 | 2063 ngx_event_pipe_t *p; |
479 | 2064 ngx_http_upstream_t *u; |
2065 | |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2066 c = r->connection; |
479 | 2067 u = r->upstream; |
581 | 2068 p = u->pipe; |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2069 wev = c->write; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2070 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2071 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2072 "http upstream process downstream"); |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2073 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2074 c->log->action = "sending to client"; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2075 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2076 if (wev->timedout) { |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2077 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2078 if (wev->delayed) { |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2079 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2080 wev->timedout = 0; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2081 wev->delayed = 0; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2082 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2083 if (!wev->ready) { |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2084 ngx_add_timer(wev, p->send_timeout); |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2085 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2086 if (ngx_handle_write_event(wev, p->send_lowat) != NGX_OK) { |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2087 ngx_http_upstream_finalize_request(r, u, 0); |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2088 } |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2089 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2090 return; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2091 } |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2092 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2093 if (ngx_event_pipe(p, wev->write) == NGX_ABORT) { |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2094 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2095 if (c->destroyed) { |
527 | 2096 return; |
2097 } | |
2098 | |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2099 ngx_http_upstream_finalize_request(r, u, 0); |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2100 return; |
527 | 2101 } |
479 | 2102 |
2103 } else { | |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2104 p->downstream_error = 1; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2105 c->timedout = 1; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2106 ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out"); |
479 | 2107 } |
2108 | |
2109 } else { | |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2110 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2111 if (wev->delayed) { |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2112 |
527 | 2113 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, |
2114 "http downstream delayed"); | |
2115 | |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2116 if (ngx_handle_write_event(wev, p->send_lowat) != NGX_OK) { |
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
2117 ngx_http_upstream_finalize_request(r, u, 0); |
527 | 2118 } |
2119 | |
2120 return; | |
2121 } | |
2122 | |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2123 if (ngx_event_pipe(p, 1) == NGX_ABORT) { |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2124 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2125 if (c->destroyed) { |
583 | 2126 return; |
2127 } | |
2128 | |
479 | 2129 ngx_http_upstream_finalize_request(r, u, 0); |
2130 return; | |
2131 } | |
2132 } | |
577 | 2133 |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2134 ngx_http_upstream_process_request(r); |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2135 } |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2136 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2137 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2138 static void |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2139 ngx_http_upstream_process_upstream(ngx_http_request_t *r, |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2140 ngx_http_upstream_t *u) |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2141 { |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2142 ngx_connection_t *c; |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2143 |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2144 c = u->peer.connection; |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2145 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2146 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2147 "http upstream process upstream"); |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2148 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2149 c->log->action = "reading upstream"; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2150 |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2151 if (c->read->timedout) { |
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2152 u->pipe->upstream_error = 1; |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2153 ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out"); |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2154 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2155 } else { |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2156 c = r->connection; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2157 |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2158 if (ngx_event_pipe(u->pipe, 0) == NGX_ABORT) { |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2159 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2160 if (c->destroyed) { |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2161 return; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2162 } |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2163 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2164 ngx_http_upstream_finalize_request(r, u, 0); |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2165 return; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2166 } |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2167 } |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2168 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2169 ngx_http_upstream_process_request(r); |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2170 } |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2171 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2172 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2173 static void |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2174 ngx_http_upstream_process_request(ngx_http_request_t *r) |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2175 { |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2176 ngx_temp_file_t *tf; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2177 ngx_event_pipe_t *p; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2178 ngx_http_upstream_t *u; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2179 |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2180 u = r->upstream; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2181 p = u->pipe; |
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2182 |
479 | 2183 if (u->peer.connection) { |
2184 | |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2185 if (u->store) { |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2186 |
1885
e5897822515f
test response length in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1777
diff
changeset
|
2187 tf = u->pipe->temp_file; |
e5897822515f
test response length in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1777
diff
changeset
|
2188 |
e5897822515f
test response length in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1777
diff
changeset
|
2189 if (p->upstream_eof |
e5897822515f
test response length in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1777
diff
changeset
|
2190 && u->headers_in.status_n == NGX_HTTP_OK |
e5897822515f
test response length in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1777
diff
changeset
|
2191 && (u->headers_in.content_length_n == -1 |
e5897822515f
test response length in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1777
diff
changeset
|
2192 || (u->headers_in.content_length_n == tf->offset))) |
e5897822515f
test response length in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1777
diff
changeset
|
2193 { |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2194 ngx_http_upstream_store(r, u); |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2195 |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2196 } else if ((p->upstream_error |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2197 || (p->upstream_eof |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2198 && u->headers_in.status_n != NGX_HTTP_OK)) |
1885
e5897822515f
test response length in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1777
diff
changeset
|
2199 && tf->file.fd != NGX_INVALID_FILE) |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2200 { |
1885
e5897822515f
test response length in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1777
diff
changeset
|
2201 if (ngx_delete_file(tf->file.name.data) == NGX_FILE_ERROR) { |
e5897822515f
test response length in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1777
diff
changeset
|
2202 |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2203 ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno, |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2204 ngx_delete_file_n " \"%s\" failed", |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2205 u->pipe->temp_file->file.name.data); |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2206 } |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2207 } |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2208 } |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2209 |
479 | 2210 #if (NGX_HTTP_FILE_CACHE) |
2211 | |
1565 | 2212 if (p->upstream_done && u->cacheable) { |
479 | 2213 if (ngx_http_cache_update(r) == NGX_ERROR) { |
2214 ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock); | |
2215 ngx_http_upstream_finalize_request(r, u, 0); | |
2216 return; | |
2217 } | |
2218 | |
1565 | 2219 } else if (p->upstream_eof && u->cacheable) { |
479 | 2220 |
2221 /* TODO: check length & update cache */ | |
2222 | |
2223 if (ngx_http_cache_update(r) == NGX_ERROR) { | |
2224 ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock); | |
2225 ngx_http_upstream_finalize_request(r, u, 0); | |
2226 return; | |
2227 } | |
2228 } | |
2229 | |
2230 #endif | |
2231 | |
2232 if (p->upstream_done || p->upstream_eof || p->upstream_error) { | |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2233 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
483 | 2234 "http upstream exit: %p", p->out); |
479 | 2235 #if 0 |
2236 ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock); | |
2237 #endif | |
2238 ngx_http_upstream_finalize_request(r, u, 0); | |
2239 return; | |
2240 } | |
2241 } | |
2242 | |
2243 if (p->downstream_error) { | |
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2244 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
483 | 2245 "http upstream downstream error"); |
479 | 2246 |
1565 | 2247 if (!u->cacheable && u->peer.connection) { |
479 | 2248 ngx_http_upstream_finalize_request(r, u, 0); |
2249 } | |
2250 } | |
2251 } | |
2252 | |
2253 | |
487 | 2254 static void |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2255 ngx_http_upstream_store(ngx_http_request_t *r, ngx_http_upstream_t *u) |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2256 { |
1947
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2257 size_t root; |
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2258 time_t lm; |
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2259 ngx_str_t path; |
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2260 ngx_temp_file_t *tf; |
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2261 ngx_ext_rename_file_t ext; |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2262 |
1777 | 2263 tf = u->pipe->temp_file; |
2264 | |
2265 if (tf->file.fd == NGX_INVALID_FILE) { | |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2266 |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2267 /* create file for empty 200 response */ |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2268 |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2269 tf = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t)); |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2270 if (tf == NULL) { |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2271 return; |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2272 } |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2273 |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2274 tf->file.fd = NGX_INVALID_FILE; |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2275 tf->file.log = r->connection->log; |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2276 tf->path = u->conf->temp_path; |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2277 tf->pool = r->pool; |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2278 tf->persistent = 1; |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2279 |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2280 if (ngx_create_temp_file(&tf->file, tf->path, tf->pool, |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2281 tf->persistent, tf->clean, tf->access) |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2282 != NGX_OK) |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2283 { |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2284 return; |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2285 } |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2286 |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2287 u->pipe->temp_file = tf; |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2288 } |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2289 |
1947
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2290 ext.access = u->conf->store_access; |
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2291 ext.time = -1; |
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2292 ext.create_path = 1; |
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2293 ext.delete_file = 1; |
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2294 ext.log = r->connection->log; |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2295 |
1705 | 2296 if (u->headers_in.last_modified) { |
2297 | |
1947
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2298 lm = ngx_http_parse_time(u->headers_in.last_modified->value.data, |
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2299 u->headers_in.last_modified->value.len); |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2300 |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2301 if (lm != NGX_ERROR) { |
1947
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2302 ext.time = lm; |
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2303 ext.fd = tf->file.fd; |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2304 } |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2305 } |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2306 |
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2307 if (u->conf->store_lengths == NULL) { |
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2308 |
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2309 ngx_http_map_uri_to_path(r, &path, &root, 0); |
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2310 |
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2311 } else { |
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2312 if (ngx_http_script_run(r, &path, u->conf->store_lengths->elts, 0, |
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2313 u->conf->store_values->elts) |
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2314 == NULL) |
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2315 { |
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2316 return; |
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2317 } |
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2318 } |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2319 |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2320 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
1947
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2321 "upstream stores \"%s\" to \"%s\"", |
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2322 tf->file.name.data, path.data); |
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2323 |
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2324 (void) ngx_ext_rename_file(&tf->file.name, &path, &ext); |
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2325 } |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2326 |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2327 |
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2328 static void |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2329 ngx_http_upstream_dummy_handler(ngx_http_request_t *r, ngx_http_upstream_t *u) |
479 | 2330 { |
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2331 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
479 | 2332 "http upstream dummy handler"); |
2333 } | |
2334 | |
2335 | |
487 | 2336 static void |
2337 ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u, | |
2338 ngx_uint_t ft_type) | |
479 | 2339 { |
884 | 2340 ngx_uint_t status, state; |
479 | 2341 |
2342 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
884 | 2343 "http next upstream, %xi", ft_type); |
479 | 2344 |
2345 #if 0 | |
2346 ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock); | |
2347 #endif | |
2348 | |
525 | 2349 if (ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_404) { |
884 | 2350 state = NGX_PEER_NEXT; |
525 | 2351 } else { |
884 | 2352 state = NGX_PEER_FAILED; |
479 | 2353 } |
525 | 2354 |
1378 | 2355 if (ft_type != NGX_HTTP_UPSTREAM_FT_NOLIVE) { |
2356 u->peer.free(&u->peer, u->peer.data, state); | |
2357 } | |
525 | 2358 |
479 | 2359 if (ft_type == NGX_HTTP_UPSTREAM_FT_TIMEOUT) { |
2360 ngx_log_error(NGX_LOG_ERR, r->connection->log, NGX_ETIMEDOUT, | |
2361 "upstream timed out"); | |
2362 } | |
577 | 2363 |
479 | 2364 if (u->peer.cached && ft_type == NGX_HTTP_UPSTREAM_FT_ERROR) { |
2365 status = 0; | |
2366 | |
2367 } else { | |
2368 switch(ft_type) { | |
2369 | |
2370 case NGX_HTTP_UPSTREAM_FT_TIMEOUT: | |
2371 status = NGX_HTTP_GATEWAY_TIME_OUT; | |
2372 break; | |
2373 | |
2374 case NGX_HTTP_UPSTREAM_FT_HTTP_500: | |
2375 status = NGX_HTTP_INTERNAL_SERVER_ERROR; | |
2376 break; | |
2377 | |
2378 case NGX_HTTP_UPSTREAM_FT_HTTP_404: | |
2379 status = NGX_HTTP_NOT_FOUND; | |
2380 break; | |
2381 | |
2382 /* | |
2383 * NGX_HTTP_UPSTREAM_FT_BUSY_LOCK and NGX_HTTP_UPSTREAM_FT_MAX_WAITING | |
2384 * never reach here | |
2385 */ | |
2386 | |
2387 default: | |
2388 status = NGX_HTTP_BAD_GATEWAY; | |
2389 } | |
2390 } | |
2391 | |
583 | 2392 if (r->connection->error) { |
479 | 2393 ngx_http_upstream_finalize_request(r, u, |
2394 NGX_HTTP_CLIENT_CLOSED_REQUEST); | |
2395 return; | |
2396 } | |
2397 | |
2398 if (status) { | |
2399 u->state->status = status; | |
2400 | |
525 | 2401 if (u->peer.tries == 0 || !(u->conf->next_upstream & ft_type)) { |
479 | 2402 |
2403 #if (NGX_HTTP_CACHE) | |
2404 | |
2405 if (u->stale && (u->conf->use_stale & ft_type)) { | |
2406 ngx_http_upstream_finalize_request(r, u, | |
525 | 2407 ngx_http_send_cached_response(r)); |
479 | 2408 return; |
2409 } | |
2410 | |
2411 #endif | |
2412 | |
2413 ngx_http_upstream_finalize_request(r, u, status); | |
2414 return; | |
2415 } | |
2416 } | |
2417 | |
2418 if (u->peer.connection) { | |
2419 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
2420 "close http upstream connection: %d", | |
2421 u->peer.connection->fd); | |
577 | 2422 #if (NGX_HTTP_SSL) |
884 | 2423 |
577 | 2424 if (u->peer.connection->ssl) { |
884 | 2425 u->peer.connection->ssl->no_wait_shutdown = 1; |
2426 u->peer.connection->ssl->no_send_shutdown = 1; | |
2427 | |
2428 (void) ngx_ssl_shutdown(u->peer.connection); | |
577 | 2429 } |
2430 #endif | |
884 | 2431 |
479 | 2432 ngx_close_connection(u->peer.connection); |
2433 } | |
2434 | |
2435 #if 0 | |
2436 if (u->conf->busy_lock && !u->busy_locked) { | |
2437 ngx_http_upstream_busy_lock(p); | |
2438 return; | |
2439 } | |
2440 #endif | |
2441 | |
2442 ngx_http_upstream_connect(r, u); | |
2443 } | |
2444 | |
2445 | |
487 | 2446 static void |
569 | 2447 ngx_http_upstream_cleanup(void *data) |
2448 { | |
2449 ngx_http_request_t *r = data; | |
2450 | |
1705 | 2451 ngx_http_upstream_t *u; |
2452 | |
569 | 2453 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
2454 "cleanup http upstream request: \"%V\"", &r->uri); | |
2455 | |
1705 | 2456 u = r->upstream; |
2457 | |
2458 if (u->resolved && u->resolved->ctx) { | |
2459 ngx_resolve_name_done(u->resolved->ctx); | |
1658 | 2460 } |
2461 | |
1705 | 2462 ngx_http_upstream_finalize_request(r, u, NGX_DONE); |
569 | 2463 } |
2464 | |
2465 | |
2466 static void | |
487 | 2467 ngx_http_upstream_finalize_request(ngx_http_request_t *r, |
2468 ngx_http_upstream_t *u, ngx_int_t rc) | |
479 | 2469 { |
889
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
2470 ngx_time_t *tp; |
563 | 2471 |
483 | 2472 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
2473 "finalize http upstream request: %i", rc); | |
479 | 2474 |
569 | 2475 *u->cleanup = NULL; |
2476 | |
1658 | 2477 if (u->state && u->state->response_sec) { |
563 | 2478 tp = ngx_timeofday(); |
889
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
2479 u->state->response_sec = tp->sec - u->state->response_sec; |
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
2480 u->state->response_msec = tp->msec - u->state->response_msec; |
563 | 2481 } |
2482 | |
479 | 2483 u->finalize_request(r, rc); |
2484 | |
1658 | 2485 if (u->peer.free) { |
2486 u->peer.free(&u->peer, u->peer.data, 0); | |
2487 } | |
884 | 2488 |
479 | 2489 if (u->peer.connection) { |
884 | 2490 |
577 | 2491 #if (NGX_HTTP_SSL) |
2492 | |
2493 /* TODO: do not shutdown persistent connection */ | |
2494 | |
2495 if (u->peer.connection->ssl) { | |
884 | 2496 |
2497 /* | |
2498 * We send the "close notify" shutdown alert to the upstream only | |
2499 * and do not wait its "close notify" shutdown alert. | |
2500 * It is acceptable according to the TLS standard. | |
2501 */ | |
2502 | |
2503 u->peer.connection->ssl->no_wait_shutdown = 1; | |
2504 | |
2505 (void) ngx_ssl_shutdown(u->peer.connection); | |
577 | 2506 } |
2507 #endif | |
884 | 2508 |
2509 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
2510 "close http upstream connection: %d", | |
2511 u->peer.connection->fd); | |
2512 | |
479 | 2513 ngx_close_connection(u->peer.connection); |
2514 } | |
2515 | |
483 | 2516 u->peer.connection = NULL; |
2517 | |
563 | 2518 if (u->header_sent && (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE)) |
479 | 2519 { |
2520 rc = 0; | |
2521 } | |
2522 | |
581 | 2523 if (u->pipe && u->pipe->temp_file) { |
479 | 2524 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
2525 "http upstream temp fd: %d", | |
581 | 2526 u->pipe->temp_file->file.fd); |
479 | 2527 } |
2528 | |
2529 #if 0 | |
2530 if (u->cache) { | |
2531 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
483 | 2532 "http upstream cache fd: %d", |
479 | 2533 u->cache->ctx.file.fd); |
2534 } | |
2535 #endif | |
2536 | |
515 | 2537 if (rc == NGX_DECLINED) { |
2538 return; | |
2539 } | |
2540 | |
483 | 2541 r->connection->log->action = "sending to client"; |
2542 | |
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
2543 if (rc == 0 && r == r->main && !r->post_action) { |
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
2544 rc = ngx_http_send_special(r, NGX_HTTP_LAST); |
479 | 2545 } |
2546 | |
2547 ngx_http_finalize_request(r, rc); | |
2548 } | |
2549 | |
2550 | |
509 | 2551 static ngx_int_t |
2552 ngx_http_upstream_process_header_line(ngx_http_request_t *r, ngx_table_elt_t *h, | |
2553 ngx_uint_t offset) | |
577 | 2554 { |
509 | 2555 ngx_table_elt_t **ph; |
577 | 2556 |
509 | 2557 ph = (ngx_table_elt_t **) ((char *) &r->upstream->headers_in + offset); |
2558 | |
2559 if (*ph == NULL) { | |
2560 *ph = h; | |
2561 } | |
2562 | |
2563 return NGX_OK; | |
2564 } | |
2565 | |
2566 | |
2567 static ngx_int_t | |
2568 ngx_http_upstream_process_multi_header_lines(ngx_http_request_t *r, | |
2569 ngx_table_elt_t *h, ngx_uint_t offset) | |
2570 { | |
2571 ngx_array_t *pa; | |
2572 ngx_table_elt_t **ph; | |
2573 | |
2574 pa = (ngx_array_t *) ((char *) &r->upstream->headers_in + offset); | |
2575 | |
2576 if (pa->elts == NULL) { | |
2577 if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *)) != NGX_OK) | |
2578 { | |
2579 return NGX_ERROR; | |
2580 } | |
2581 } | |
2582 | |
2583 ph = ngx_array_push(pa); | |
2584 if (ph == NULL) { | |
2585 return NGX_ERROR; | |
2586 } | |
2587 | |
2588 *ph = h; | |
2589 | |
2590 return NGX_OK; | |
2591 } | |
2592 | |
2593 | |
2594 static ngx_int_t | |
2595 ngx_http_upstream_ignore_header_line(ngx_http_request_t *r, ngx_table_elt_t *h, | |
2596 ngx_uint_t offset) | |
2597 { | |
2598 return NGX_OK; | |
2599 } | |
2600 | |
2601 | |
2602 static ngx_int_t | |
527 | 2603 ngx_http_upstream_process_limit_rate(ngx_http_request_t *r, ngx_table_elt_t *h, |
2604 ngx_uint_t offset) | |
577 | 2605 { |
527 | 2606 ngx_int_t n; |
2607 | |
2608 r->upstream->headers_in.x_accel_limit_rate = h; | |
2609 | |
2610 n = ngx_atoi(h->value.data, h->value.len); | |
2611 | |
2612 if (n != NGX_ERROR) { | |
2613 r->limit_rate = (size_t) n; | |
2614 } | |
2615 | |
2616 return NGX_OK; | |
2617 } | |
2618 | |
2619 | |
2620 static ngx_int_t | |
649 | 2621 ngx_http_upstream_process_buffering(ngx_http_request_t *r, ngx_table_elt_t *h, |
2622 ngx_uint_t offset) | |
2623 { | |
2624 u_char c0, c1, c2; | |
2625 | |
2626 if (r->upstream->conf->change_buffering) { | |
2627 | |
2628 if (h->value.len == 2) { | |
2629 c0 = ngx_tolower(h->value.data[0]); | |
2630 c1 = ngx_tolower(h->value.data[1]); | |
2631 | |
2632 if (c0 == 'n' && c1 == 'o') { | |
2633 r->upstream->buffering = 0; | |
2634 } | |
2635 | |
2636 } else if (h->value.len == 3) { | |
2637 c0 = ngx_tolower(h->value.data[0]); | |
2638 c1 = ngx_tolower(h->value.data[1]); | |
2639 c2 = ngx_tolower(h->value.data[2]); | |
2640 | |
2641 if (c0 == 'y' && c1 == 'e' && c2 == 's') { | |
2642 r->upstream->buffering = 1; | |
2643 } | |
2644 } | |
2645 } | |
2646 | |
2647 return NGX_OK; | |
2648 } | |
2649 | |
2650 | |
2651 static ngx_int_t | |
657 | 2652 ngx_http_upstream_process_charset(ngx_http_request_t *r, ngx_table_elt_t *h, |
2653 ngx_uint_t offset) | |
2654 { | |
2655 r->headers_out.override_charset = &h->value; | |
2656 | |
2657 return NGX_OK; | |
2658 } | |
2659 | |
2660 | |
2661 static ngx_int_t | |
509 | 2662 ngx_http_upstream_copy_header_line(ngx_http_request_t *r, ngx_table_elt_t *h, |
2663 ngx_uint_t offset) | |
2664 { | |
573 | 2665 ngx_table_elt_t *ho, **ph; |
509 | 2666 |
2667 ho = ngx_list_push(&r->headers_out.headers); | |
2668 if (ho == NULL) { | |
2669 return NGX_ERROR; | |
2670 } | |
2671 | |
2672 *ho = *h; | |
2673 | |
573 | 2674 if (offset) { |
2675 ph = (ngx_table_elt_t **) ((char *) &r->headers_out + offset); | |
2676 *ph = ho; | |
2677 } | |
2678 | |
509 | 2679 return NGX_OK; |
2680 } | |
2681 | |
2682 | |
2683 static ngx_int_t | |
2684 ngx_http_upstream_copy_multi_header_lines(ngx_http_request_t *r, | |
2685 ngx_table_elt_t *h, ngx_uint_t offset) | |
2686 { | |
2687 ngx_array_t *pa; | |
2688 ngx_table_elt_t *ho, **ph; | |
2689 | |
2690 pa = (ngx_array_t *) ((char *) &r->headers_out + offset); | |
2691 | |
2692 if (pa->elts == NULL) { | |
2693 if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *)) != NGX_OK) | |
2694 { | |
2695 return NGX_ERROR; | |
2696 } | |
2697 } | |
2698 | |
2699 ph = ngx_array_push(pa); | |
2700 if (ph == NULL) { | |
2701 return NGX_ERROR; | |
2702 } | |
2703 | |
2704 ho = ngx_list_push(&r->headers_out.headers); | |
2705 if (ho == NULL) { | |
2706 return NGX_ERROR; | |
2707 } | |
2708 | |
2709 *ho = *h; | |
2710 *ph = ho; | |
2711 | |
2712 return NGX_OK; | |
2713 } | |
2714 | |
2715 | |
2716 static ngx_int_t | |
2717 ngx_http_upstream_copy_content_type(ngx_http_request_t *r, ngx_table_elt_t *h, | |
2718 ngx_uint_t offset) | |
2719 { | |
657 | 2720 u_char *p, *last; |
2721 | |
2722 r->headers_out.content_type_len = h->value.len; | |
509 | 2723 r->headers_out.content_type = h->value; |
2724 | |
657 | 2725 for (p = h->value.data; *p; p++) { |
2726 | |
2727 if (*p != ';') { | |
2728 continue; | |
2729 } | |
2730 | |
2731 last = p; | |
2732 | |
2733 while (*++p == ' ') { /* void */ } | |
2734 | |
1968 | 2735 if (*p == '\0') { |
2736 return NGX_OK; | |
2737 } | |
2738 | |
1107
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1098
diff
changeset
|
2739 if (ngx_strncasecmp(p, (u_char *) "charset=", 8) != 0) { |
657 | 2740 continue; |
2741 } | |
2742 | |
2743 p += 8; | |
2744 | |
2745 r->headers_out.content_type_len = last - h->value.data; | |
2746 | |
2244 | 2747 if (*p == '"') { |
2748 p++; | |
2749 } | |
2750 | |
2751 last = h->value.data + h->value.len; | |
2752 | |
2753 if (*(last - 1) == '"') { | |
2754 last--; | |
2755 } | |
2756 | |
2757 r->headers_out.charset.len = last - p; | |
657 | 2758 r->headers_out.charset.data = p; |
1143
c6c42497106c
fix segfault if upstream sends trailing ";" in "charset="
Igor Sysoev <igor@sysoev.ru>
parents:
1109
diff
changeset
|
2759 |
c6c42497106c
fix segfault if upstream sends trailing ";" in "charset="
Igor Sysoev <igor@sysoev.ru>
parents:
1109
diff
changeset
|
2760 return NGX_OK; |
657 | 2761 } |
2762 | |
509 | 2763 return NGX_OK; |
2764 } | |
2765 | |
2766 | |
2767 static ngx_int_t | |
2768 ngx_http_upstream_copy_content_length(ngx_http_request_t *r, ngx_table_elt_t *h, | |
2769 ngx_uint_t offset) | |
2770 { | |
2771 ngx_table_elt_t *ho; | |
2772 | |
2773 ho = ngx_list_push(&r->headers_out.headers); | |
2774 if (ho == NULL) { | |
2775 return NGX_ERROR; | |
2776 } | |
2777 | |
2778 *ho = *h; | |
2779 | |
2780 r->headers_out.content_length = ho; | |
2781 r->headers_out.content_length_n = ngx_atoof(h->value.data, h->value.len); | |
2782 | |
2783 return NGX_OK; | |
2784 } | |
2785 | |
2786 | |
2787 static ngx_int_t | |
2788 ngx_http_upstream_rewrite_location(ngx_http_request_t *r, ngx_table_elt_t *h, | |
2789 ngx_uint_t offset) | |
2790 { | |
2791 ngx_int_t rc; | |
2792 ngx_table_elt_t *ho; | |
2793 | |
2794 ho = ngx_list_push(&r->headers_out.headers); | |
2795 if (ho == NULL) { | |
2796 return NGX_ERROR; | |
2797 } | |
2798 | |
2799 *ho = *h; | |
2800 | |
2801 if (r->upstream->rewrite_redirect) { | |
2802 rc = r->upstream->rewrite_redirect(r, ho, 0); | |
2803 | |
529 | 2804 if (rc == NGX_DECLINED) { |
2805 return NGX_OK; | |
2806 } | |
2807 | |
509 | 2808 if (rc == NGX_OK) { |
2809 r->headers_out.location = ho; | |
2810 | |
2811 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
2812 "rewritten location: \"%V\"", &ho->value); | |
2813 } | |
2814 | |
2815 return rc; | |
2816 } | |
2817 | |
1653
ea681a6a0c61
set r->headers_out.location for non-local redirects
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
2818 if (ho->value.data[0] != '/') { |
ea681a6a0c61
set r->headers_out.location for non-local redirects
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
2819 r->headers_out.location = ho; |
ea681a6a0c61
set r->headers_out.location for non-local redirects
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
2820 } |
ea681a6a0c61
set r->headers_out.location for non-local redirects
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
2821 |
509 | 2822 /* |
2823 * we do not set r->headers_out.location here to avoid the handling | |
2824 * the local redirects without a host name by ngx_http_header_filter() | |
2825 */ | |
2826 | |
2827 return NGX_OK; | |
2828 } | |
2829 | |
2830 | |
2831 static ngx_int_t | |
2832 ngx_http_upstream_rewrite_refresh(ngx_http_request_t *r, ngx_table_elt_t *h, | |
2833 ngx_uint_t offset) | |
2834 { | |
2835 u_char *p; | |
2836 ngx_int_t rc; | |
2837 ngx_table_elt_t *ho; | |
2838 | |
2839 ho = ngx_list_push(&r->headers_out.headers); | |
2840 if (ho == NULL) { | |
2841 return NGX_ERROR; | |
2842 } | |
2843 | |
2844 *ho = *h; | |
2845 | |
2846 if (r->upstream->rewrite_redirect) { | |
2847 | |
1549 | 2848 p = ngx_strcasestrn(ho->value.data, "url=", 4 - 1); |
509 | 2849 |
2850 if (p) { | |
2851 rc = r->upstream->rewrite_redirect(r, ho, p + 4 - ho->value.data); | |
2852 | |
2853 } else { | |
2854 return NGX_OK; | |
2855 } | |
2856 | |
529 | 2857 if (rc == NGX_DECLINED) { |
2858 return NGX_OK; | |
2859 } | |
2860 | |
509 | 2861 if (rc == NGX_OK) { |
1654 | 2862 r->headers_out.refresh = ho; |
2863 | |
509 | 2864 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
2865 "rewritten refresh: \"%V\"", &ho->value); | |
2866 } | |
2867 | |
2868 return rc; | |
2869 } | |
2870 | |
1654 | 2871 r->headers_out.refresh = ho; |
2872 | |
509 | 2873 return NGX_OK; |
2874 } | |
2875 | |
2876 | |
2877 #if (NGX_HTTP_GZIP) | |
2878 | |
2879 static ngx_int_t | |
2880 ngx_http_upstream_copy_content_encoding(ngx_http_request_t *r, | |
2881 ngx_table_elt_t *h, ngx_uint_t offset) | |
2882 { | |
2883 ngx_table_elt_t *ho; | |
2884 | |
2885 ho = ngx_list_push(&r->headers_out.headers); | |
2886 if (ho == NULL) { | |
2887 return NGX_ERROR; | |
2888 } | |
2889 | |
2890 *ho = *h; | |
2891 | |
2892 r->headers_out.content_encoding = ho; | |
2893 | |
2894 return NGX_OK; | |
2895 } | |
2896 | |
2897 #endif | |
2898 | |
2899 | |
487 | 2900 static ngx_int_t |
573 | 2901 ngx_http_upstream_add_variables(ngx_conf_t *cf) |
479 | 2902 { |
880 | 2903 ngx_http_variable_t *var, *v; |
479 | 2904 |
573 | 2905 for (v = ngx_http_upstream_vars; v->name.len; v++) { |
2906 var = ngx_http_add_variable(cf, &v->name, v->flags); | |
2907 if (var == NULL) { | |
2908 return NGX_ERROR; | |
2909 } | |
2910 | |
637 | 2911 var->get_handler = v->get_handler; |
573 | 2912 var->data = v->data; |
2913 } | |
2914 | |
479 | 2915 return NGX_OK; |
2916 } | |
509 | 2917 |
2918 | |
573 | 2919 static ngx_int_t |
1181 | 2920 ngx_http_upstream_addr_variable(ngx_http_request_t *r, |
2921 ngx_http_variable_value_t *v, uintptr_t data) | |
2922 { | |
2923 u_char *p; | |
2924 size_t len; | |
2925 ngx_uint_t i; | |
2926 ngx_http_upstream_state_t *state; | |
2927 | |
2928 v->valid = 1; | |
1565 | 2929 v->no_cacheable = 0; |
1181 | 2930 v->not_found = 0; |
2931 | |
2932 if (r->upstream_states == NULL || r->upstream_states->nelts == 0) { | |
2933 v->not_found = 1; | |
2934 return NGX_OK; | |
2935 } | |
2936 | |
2937 len = 0; | |
2938 state = r->upstream_states->elts; | |
2939 | |
2940 for (i = 0; i < r->upstream_states->nelts; i++) { | |
2941 if (state[i].peer) { | |
2942 len += state[i].peer->len + 2; | |
2943 | |
2944 } else { | |
2945 len += 3; | |
2946 } | |
2947 } | |
2948 | |
2049 | 2949 p = ngx_pnalloc(r->pool, len); |
1181 | 2950 if (p == NULL) { |
2951 return NGX_ERROR; | |
2952 } | |
2953 | |
2954 v->data = p; | |
2955 | |
2956 i = 0; | |
2957 | |
2958 for ( ;; ) { | |
2959 if (state[i].peer) { | |
2960 p = ngx_cpymem(p, state[i].peer->data, state[i].peer->len); | |
2961 } | |
2962 | |
2963 if (++i == r->upstream_states->nelts) { | |
2964 break; | |
2965 } | |
2966 | |
2967 if (state[i].peer) { | |
2968 *p++ = ','; | |
2969 *p++ = ' '; | |
2970 | |
2971 } else { | |
2972 *p++ = ' '; | |
2973 *p++ = ':'; | |
2974 *p++ = ' '; | |
2975 | |
2976 if (++i == r->upstream_states->nelts) { | |
2977 break; | |
2978 } | |
2979 | |
2980 continue; | |
2981 } | |
2982 } | |
2983 | |
2984 v->len = p - v->data; | |
2985 | |
2986 return NGX_OK; | |
2987 } | |
2988 | |
2989 | |
2990 static ngx_int_t | |
573 | 2991 ngx_http_upstream_status_variable(ngx_http_request_t *r, |
2992 ngx_http_variable_value_t *v, uintptr_t data) | |
2993 { | |
2994 u_char *p; | |
2995 size_t len; | |
2996 ngx_uint_t i; | |
2997 ngx_http_upstream_state_t *state; | |
2998 | |
2999 v->valid = 1; | |
1565 | 3000 v->no_cacheable = 0; |
573 | 3001 v->not_found = 0; |
3002 | |
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3003 if (r->upstream_states == NULL || r->upstream_states->nelts == 0) { |
573 | 3004 v->not_found = 1; |
3005 return NGX_OK; | |
3006 } | |
3007 | |
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3008 len = r->upstream_states->nelts * (3 + 2); |
573 | 3009 |
2049 | 3010 p = ngx_pnalloc(r->pool, len); |
573 | 3011 if (p == NULL) { |
3012 return NGX_ERROR; | |
3013 } | |
3014 | |
3015 v->data = p; | |
3016 | |
3017 i = 0; | |
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3018 state = r->upstream_states->elts; |
573 | 3019 |
3020 for ( ;; ) { | |
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3021 if (state[i].status) { |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3022 p = ngx_sprintf(p, "%ui", state[i].status); |
573 | 3023 |
3024 } else { | |
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3025 *p++ = '-'; |
573 | 3026 } |
3027 | |
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3028 if (++i == r->upstream_states->nelts) { |
573 | 3029 break; |
3030 } | |
3031 | |
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3032 if (state[i].peer) { |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3033 *p++ = ','; |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3034 *p++ = ' '; |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3035 |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3036 } else { |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3037 *p++ = ' '; |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3038 *p++ = ':'; |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3039 *p++ = ' '; |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3040 |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3041 if (++i == r->upstream_states->nelts) { |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3042 break; |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3043 } |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3044 |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3045 continue; |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3046 } |
573 | 3047 } |
3048 | |
3049 v->len = p - v->data; | |
3050 | |
3051 return NGX_OK; | |
3052 } | |
3053 | |
3054 | |
3055 static ngx_int_t | |
3056 ngx_http_upstream_response_time_variable(ngx_http_request_t *r, | |
3057 ngx_http_variable_value_t *v, uintptr_t data) | |
3058 { | |
3059 u_char *p; | |
3060 size_t len; | |
3061 ngx_uint_t i; | |
889
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
3062 ngx_msec_int_t ms; |
573 | 3063 ngx_http_upstream_state_t *state; |
3064 | |
3065 v->valid = 1; | |
1565 | 3066 v->no_cacheable = 0; |
573 | 3067 v->not_found = 0; |
3068 | |
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3069 if (r->upstream_states == NULL || r->upstream_states->nelts == 0) { |
573 | 3070 v->not_found = 1; |
3071 return NGX_OK; | |
3072 } | |
3073 | |
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3074 len = r->upstream_states->nelts * (NGX_TIME_T_LEN + 4 + 2); |
573 | 3075 |
2049 | 3076 p = ngx_pnalloc(r->pool, len); |
573 | 3077 if (p == NULL) { |
3078 return NGX_ERROR; | |
3079 } | |
3080 | |
3081 v->data = p; | |
3082 | |
3083 i = 0; | |
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3084 state = r->upstream_states->elts; |
573 | 3085 |
3086 for ( ;; ) { | |
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3087 if (state[i].status) { |
1640 | 3088 ms = (ngx_msec_int_t) |
3089 (state[i].response_sec * 1000 + state[i].response_msec); | |
889
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
3090 ms = (ms >= 0) ? ms : 0; |
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
3091 p = ngx_sprintf(p, "%d.%03d", ms / 1000, ms % 1000); |
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3092 |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3093 } else { |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3094 *p++ = '-'; |
573 | 3095 } |
3096 | |
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3097 if (++i == r->upstream_states->nelts) { |
573 | 3098 break; |
3099 } | |
3100 | |
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3101 if (state[i].peer) { |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3102 *p++ = ','; |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3103 *p++ = ' '; |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3104 |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3105 } else { |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3106 *p++ = ' '; |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3107 *p++ = ':'; |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3108 *p++ = ' '; |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3109 |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3110 if (++i == r->upstream_states->nelts) { |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3111 break; |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3112 } |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3113 |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3114 continue; |
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3115 } |
573 | 3116 } |
3117 | |
3118 v->len = p - v->data; | |
3119 | |
3120 return NGX_OK; | |
3121 } | |
3122 | |
3123 | |
1162 | 3124 ngx_int_t |
3125 ngx_http_upstream_header_variable(ngx_http_request_t *r, | |
3126 ngx_http_variable_value_t *v, uintptr_t data) | |
3127 { | |
3128 if (r->upstream == NULL) { | |
3129 v->not_found = 1; | |
3130 return NGX_OK; | |
3131 } | |
3132 | |
3133 return ngx_http_variable_unknown_header(v, (ngx_str_t *) data, | |
3134 &r->upstream->headers_in.headers.part, | |
3135 sizeof("upstream_http_") - 1); | |
3136 } | |
3137 | |
3138 | |
651 | 3139 static char * |
3140 ngx_http_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy) | |
3141 { | |
884 | 3142 char *rv; |
3143 void *mconf; | |
3144 ngx_str_t *value; | |
3145 ngx_url_t u; | |
3146 ngx_uint_t m; | |
3147 ngx_conf_t pcf; | |
3148 ngx_http_module_t *module; | |
3149 ngx_http_conf_ctx_t *ctx, *http_ctx; | |
3150 ngx_http_upstream_srv_conf_t *uscf; | |
3151 | |
3152 ngx_memzero(&u, sizeof(ngx_url_t)); | |
3153 | |
3154 value = cf->args->elts; | |
3155 u.host = value[1]; | |
3156 u.no_resolve = 1; | |
3157 | |
3158 uscf = ngx_http_upstream_add(cf, &u, NGX_HTTP_UPSTREAM_CREATE | |
3159 |NGX_HTTP_UPSTREAM_WEIGHT | |
3160 |NGX_HTTP_UPSTREAM_MAX_FAILS | |
3161 |NGX_HTTP_UPSTREAM_FAIL_TIMEOUT | |
3162 |NGX_HTTP_UPSTREAM_DOWN | |
3163 |NGX_HTTP_UPSTREAM_BACKUP); | |
3164 if (uscf == NULL) { | |
3165 return NGX_CONF_ERROR; | |
3166 } | |
3167 | |
651 | 3168 |
3169 ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_conf_ctx_t)); | |
3170 if (ctx == NULL) { | |
3171 return NGX_CONF_ERROR; | |
3172 } | |
3173 | |
884 | 3174 http_ctx = cf->ctx; |
3175 ctx->main_conf = http_ctx->main_conf; | |
651 | 3176 |
3177 /* the upstream{}'s srv_conf */ | |
3178 | |
3179 ctx->srv_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_http_max_module); | |
3180 if (ctx->srv_conf == NULL) { | |
3181 return NGX_CONF_ERROR; | |
3182 } | |
3183 | |
3184 ctx->srv_conf[ngx_http_upstream_module.ctx_index] = uscf; | |
3185 | |
884 | 3186 uscf->srv_conf = ctx->srv_conf; |
3187 | |
651 | 3188 |
3189 /* the upstream{}'s loc_conf */ | |
3190 | |
3191 ctx->loc_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_http_max_module); | |
3192 if (ctx->loc_conf == NULL) { | |
3193 return NGX_CONF_ERROR; | |
3194 } | |
3195 | |
3196 for (m = 0; ngx_modules[m]; m++) { | |
3197 if (ngx_modules[m]->type != NGX_HTTP_MODULE) { | |
3198 continue; | |
3199 } | |
3200 | |
3201 module = ngx_modules[m]->ctx; | |
3202 | |
884 | 3203 if (module->create_srv_conf) { |
3204 mconf = module->create_srv_conf(cf); | |
3205 if (mconf == NULL) { | |
3206 return NGX_CONF_ERROR; | |
3207 } | |
3208 | |
3209 ctx->srv_conf[ngx_modules[m]->ctx_index] = mconf; | |
3210 } | |
3211 | |
651 | 3212 if (module->create_loc_conf) { |
3213 mconf = module->create_loc_conf(cf); | |
3214 if (mconf == NULL) { | |
3215 return NGX_CONF_ERROR; | |
3216 } | |
3217 | |
3218 ctx->loc_conf[ngx_modules[m]->ctx_index] = mconf; | |
3219 } | |
3220 } | |
3221 | |
3222 | |
3223 /* parse inside upstream{} */ | |
3224 | |
3225 pcf = *cf; | |
3226 cf->ctx = ctx; | |
3227 cf->cmd_type = NGX_HTTP_UPS_CONF; | |
3228 | |
3229 rv = ngx_conf_parse(cf, NULL); | |
3230 | |
3231 *cf = pcf; | |
3232 | |
3233 if (rv != NGX_CONF_OK) { | |
3234 return rv; | |
3235 } | |
3236 | |
3237 if (uscf->servers == NULL) { | |
3238 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
3239 "no servers are inside upstream"); | |
3240 return NGX_CONF_ERROR; | |
3241 } | |
3242 | |
3243 return rv; | |
3244 } | |
3245 | |
3246 | |
3247 static char * | |
3248 ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
3249 { | |
3250 ngx_http_upstream_srv_conf_t *uscf = conf; | |
3251 | |
884 | 3252 time_t fail_timeout; |
3253 ngx_str_t *value, s; | |
3254 ngx_url_t u; | |
3255 ngx_int_t weight, max_fails; | |
3256 ngx_uint_t i; | |
3257 ngx_http_upstream_server_t *us; | |
651 | 3258 |
3259 if (uscf->servers == NULL) { | |
884 | 3260 uscf->servers = ngx_array_create(cf->pool, 4, |
3261 sizeof(ngx_http_upstream_server_t)); | |
651 | 3262 if (uscf->servers == NULL) { |
3263 return NGX_CONF_ERROR; | |
3264 } | |
3265 } | |
3266 | |
884 | 3267 us = ngx_array_push(uscf->servers); |
3268 if (us == NULL) { | |
651 | 3269 return NGX_CONF_ERROR; |
3270 } | |
3271 | |
884 | 3272 ngx_memzero(us, sizeof(ngx_http_upstream_server_t)); |
3273 | |
651 | 3274 value = cf->args->elts; |
3275 | |
3276 ngx_memzero(&u, sizeof(ngx_url_t)); | |
3277 | |
3278 u.url = value[1]; | |
906 | 3279 u.default_port = 80; |
651 | 3280 |
1559
fe11e2a3946d
use pool instead of ngx_conf_t
Igor Sysoev <igor@sysoev.ru>
parents:
1558
diff
changeset
|
3281 if (ngx_parse_url(cf->pool, &u) != NGX_OK) { |
651 | 3282 if (u.err) { |
3283 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
3284 "%s in upstream \"%V\"", u.err, &u.url); | |
3285 } | |
3286 | |
3287 return NGX_CONF_ERROR; | |
3288 } | |
3289 | |
663 | 3290 weight = 1; |
884 | 3291 max_fails = 1; |
3292 fail_timeout = 10; | |
3293 | |
3294 for (i = 2; i < cf->args->nelts; i++) { | |
3295 | |
3296 if (ngx_strncmp(value[i].data, "weight=", 7) == 0) { | |
3297 | |
3298 if (!(uscf->flags & NGX_HTTP_UPSTREAM_WEIGHT)) { | |
3299 goto invalid; | |
3300 } | |
3301 | |
3302 weight = ngx_atoi(&value[i].data[7], value[i].len - 7); | |
663 | 3303 |
3304 if (weight == NGX_ERROR || weight == 0) { | |
3305 goto invalid; | |
3306 } | |
3307 | |
884 | 3308 continue; |
3309 } | |
3310 | |
3311 if (ngx_strncmp(value[i].data, "max_fails=", 10) == 0) { | |
3312 | |
3313 if (!(uscf->flags & NGX_HTTP_UPSTREAM_MAX_FAILS)) { | |
3314 goto invalid; | |
3315 } | |
3316 | |
3317 max_fails = ngx_atoi(&value[i].data[10], value[i].len - 10); | |
3318 | |
3319 if (max_fails == NGX_ERROR) { | |
3320 goto invalid; | |
3321 } | |
3322 | |
3323 continue; | |
663 | 3324 } |
884 | 3325 |
3326 if (ngx_strncmp(value[i].data, "fail_timeout=", 13) == 0) { | |
3327 | |
3328 if (!(uscf->flags & NGX_HTTP_UPSTREAM_FAIL_TIMEOUT)) { | |
3329 goto invalid; | |
3330 } | |
3331 | |
3332 s.len = value[i].len - 13; | |
3333 s.data = &value[i].data[13]; | |
3334 | |
3335 fail_timeout = ngx_parse_time(&s, 1); | |
3336 | |
1973 | 3337 if (fail_timeout == NGX_ERROR) { |
884 | 3338 goto invalid; |
3339 } | |
3340 | |
3341 continue; | |
3342 } | |
3343 | |
1378 | 3344 if (ngx_strncmp(value[i].data, "backup", 6) == 0) { |
3345 | |
3346 if (!(uscf->flags & NGX_HTTP_UPSTREAM_BACKUP)) { | |
3347 goto invalid; | |
3348 } | |
3349 | |
3350 us->backup = 1; | |
3351 | |
3352 continue; | |
3353 } | |
3354 | |
884 | 3355 if (ngx_strncmp(value[i].data, "down", 4) == 0) { |
3356 | |
3357 if (!(uscf->flags & NGX_HTTP_UPSTREAM_DOWN)) { | |
3358 goto invalid; | |
3359 } | |
3360 | |
3361 us->down = 1; | |
3362 | |
3363 continue; | |
3364 } | |
3365 | |
3366 goto invalid; | |
663 | 3367 } |
3368 | |
884 | 3369 us->addrs = u.addrs; |
3370 us->naddrs = u.naddrs; | |
3371 us->weight = weight; | |
3372 us->max_fails = max_fails; | |
3373 us->fail_timeout = fail_timeout; | |
651 | 3374 |
3375 return NGX_CONF_OK; | |
663 | 3376 |
3377 invalid: | |
3378 | |
884 | 3379 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
3380 "invalid parameter \"%V\"", &value[i]); | |
663 | 3381 |
3382 return NGX_CONF_ERROR; | |
651 | 3383 } |
3384 | |
3385 | |
3386 ngx_http_upstream_srv_conf_t * | |
884 | 3387 ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags) |
651 | 3388 { |
3389 ngx_uint_t i; | |
884 | 3390 ngx_http_upstream_server_t *us; |
651 | 3391 ngx_http_upstream_srv_conf_t *uscf, **uscfp; |
3392 ngx_http_upstream_main_conf_t *umcf; | |
3393 | |
884 | 3394 if (!(flags & NGX_HTTP_UPSTREAM_CREATE)) { |
3395 | |
1559
fe11e2a3946d
use pool instead of ngx_conf_t
Igor Sysoev <igor@sysoev.ru>
parents:
1558
diff
changeset
|
3396 if (ngx_parse_url(cf->pool, u) != NGX_OK) { |
651 | 3397 if (u->err) { |
3398 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
3399 "%s in upstream \"%V\"", u->err, &u->url); | |
3400 } | |
3401 | |
3402 return NULL; | |
3403 } | |
3404 } | |
3405 | |
3406 umcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_upstream_module); | |
3407 | |
3408 uscfp = umcf->upstreams.elts; | |
3409 | |
3410 for (i = 0; i < umcf->upstreams.nelts; i++) { | |
906 | 3411 |
3412 if (uscfp[i]->host.len != u->host.len | |
884 | 3413 || ngx_strncasecmp(uscfp[i]->host.data, u->host.data, u->host.len) |
3414 != 0) | |
3415 { | |
651 | 3416 continue; |
3417 } | |
3418 | |
884 | 3419 if ((flags & NGX_HTTP_UPSTREAM_CREATE) |
3420 && (uscfp[i]->flags & NGX_HTTP_UPSTREAM_CREATE)) | |
651 | 3421 { |
884 | 3422 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
3423 "duplicate upstream \"%V\"", &u->host); | |
3424 return NULL; | |
651 | 3425 } |
884 | 3426 |
906 | 3427 if ((uscfp[i]->flags & NGX_HTTP_UPSTREAM_CREATE) && u->port) { |
884 | 3428 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, |
906 | 3429 "upstream \"%V\" may not have port %d", |
3430 &u->host, u->port); | |
3431 return NULL; | |
3432 } | |
3433 | |
3434 if ((flags & NGX_HTTP_UPSTREAM_CREATE) && uscfp[i]->port) { | |
3435 ngx_log_error(NGX_LOG_WARN, cf->log, 0, | |
3436 "upstream \"%V\" may not have port %d in %s:%ui", | |
3437 &u->host, uscfp[i]->port, | |
1489
56f1ea5baabb
u_char* is enough to keep file name
Igor Sysoev <igor@sysoev.ru>
parents:
1469
diff
changeset
|
3438 uscfp[i]->file_name, uscfp[i]->line); |
906 | 3439 return NULL; |
3440 } | |
3441 | |
3442 if (uscfp[i]->port != u->port) { | |
3443 continue; | |
884 | 3444 } |
3445 | |
1340 | 3446 if (uscfp[i]->default_port && u->default_port |
3447 && uscfp[i]->default_port != u->default_port) | |
3448 { | |
3449 continue; | |
3450 } | |
3451 | |
884 | 3452 return uscfp[i]; |
651 | 3453 } |
3454 | |
3455 uscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_srv_conf_t)); | |
3456 if (uscf == NULL) { | |
3457 return NULL; | |
3458 } | |
3459 | |
884 | 3460 uscf->flags = flags; |
651 | 3461 uscf->host = u->host; |
1489
56f1ea5baabb
u_char* is enough to keep file name
Igor Sysoev <igor@sysoev.ru>
parents:
1469
diff
changeset
|
3462 uscf->file_name = cf->conf_file->file.name.data; |
651 | 3463 uscf->line = cf->conf_file->line; |
906 | 3464 uscf->port = u->port; |
3465 uscf->default_port = u->default_port; | |
884 | 3466 |
3467 if (u->naddrs == 1) { | |
3468 uscf->servers = ngx_array_create(cf->pool, 1, | |
3469 sizeof(ngx_http_upstream_server_t)); | |
3470 if (uscf->servers == NULL) { | |
3471 return NGX_CONF_ERROR; | |
3472 } | |
3473 | |
3474 us = ngx_array_push(uscf->servers); | |
3475 if (us == NULL) { | |
3476 return NGX_CONF_ERROR; | |
3477 } | |
3478 | |
3479 ngx_memzero(us, sizeof(ngx_http_upstream_server_t)); | |
3480 | |
3481 us->addrs = u->addrs; | |
3482 us->naddrs = u->naddrs; | |
3483 } | |
651 | 3484 |
3485 uscfp = ngx_array_push(&umcf->upstreams); | |
3486 if (uscfp == NULL) { | |
3487 return NULL; | |
3488 } | |
3489 | |
3490 *uscfp = uscf; | |
3491 | |
3492 return uscf; | |
3493 } | |
3494 | |
3495 | |
1701
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3496 ngx_int_t |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3497 ngx_http_upstream_hide_headers_hash(ngx_conf_t *cf, |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3498 ngx_http_upstream_conf_t *conf, ngx_http_upstream_conf_t *prev, |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3499 ngx_str_t *default_hide_headers, ngx_hash_init_t *hash) |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3500 { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3501 ngx_str_t *h; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3502 ngx_uint_t i, j; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3503 ngx_array_t hide_headers; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3504 ngx_hash_key_t *hk; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3505 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3506 if (conf->hide_headers == NGX_CONF_UNSET_PTR |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3507 && conf->pass_headers == NGX_CONF_UNSET_PTR) |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3508 { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3509 conf->hide_headers_hash = prev->hide_headers_hash; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3510 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3511 if (conf->hide_headers_hash.buckets) { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3512 return NGX_OK; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3513 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3514 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3515 conf->hide_headers = prev->hide_headers; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3516 conf->pass_headers = prev->pass_headers; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3517 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3518 } else { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3519 if (conf->hide_headers == NGX_CONF_UNSET_PTR) { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3520 conf->hide_headers = prev->hide_headers; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3521 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3522 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3523 if (conf->pass_headers == NGX_CONF_UNSET_PTR) { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3524 conf->pass_headers = prev->pass_headers; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3525 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3526 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3527 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3528 if (ngx_array_init(&hide_headers, cf->temp_pool, 4, sizeof(ngx_hash_key_t)) |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3529 != NGX_OK) |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3530 { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3531 return NGX_ERROR; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3532 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3533 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3534 for (h = default_hide_headers; h->len; h++) { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3535 hk = ngx_array_push(&hide_headers); |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3536 if (hk == NULL) { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3537 return NGX_ERROR; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3538 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3539 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3540 hk->key = *h; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3541 hk->key_hash = ngx_hash_key_lc(h->data, h->len); |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3542 hk->value = (void *) 1; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3543 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3544 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3545 if (conf->hide_headers != NGX_CONF_UNSET_PTR) { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3546 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3547 h = conf->hide_headers->elts; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3548 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3549 for (i = 0; i < conf->hide_headers->nelts; i++) { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3550 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3551 hk = hide_headers.elts; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3552 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3553 for (j = 0; j < hide_headers.nelts; j++) { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3554 if (ngx_strcasecmp(h[i].data, hk[j].key.data) == 0) { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3555 goto exist; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3556 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3557 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3558 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3559 hk = ngx_array_push(&hide_headers); |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3560 if (hk == NULL) { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3561 return NGX_ERROR; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3562 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3563 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3564 hk->key = h[i]; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3565 hk->key_hash = ngx_hash_key_lc(h[i].data, h[i].len); |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3566 hk->value = (void *) 1; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3567 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3568 exist: |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3569 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3570 continue; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3571 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3572 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3573 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3574 if (conf->pass_headers != NGX_CONF_UNSET_PTR) { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3575 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3576 h = conf->pass_headers->elts; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3577 hk = hide_headers.elts; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3578 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3579 for (i = 0; i < conf->pass_headers->nelts; i++) { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3580 for (j = 0; j < hide_headers.nelts; j++) { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3581 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3582 if (hk[j].key.data == NULL) { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3583 continue; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3584 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3585 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3586 if (ngx_strcasecmp(h[i].data, hk[j].key.data) == 0) { |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3587 hk[j].key.data = NULL; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3588 break; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3589 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3590 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3591 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3592 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3593 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3594 hash->hash = &conf->hide_headers_hash; |
1706
9242e21d2f8d
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1705
diff
changeset
|
3595 hash->key = ngx_hash_key_lc; |
1701
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3596 hash->pool = cf->pool; |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3597 hash->temp_pool = NULL; |
1706
9242e21d2f8d
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1705
diff
changeset
|
3598 |
1701
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3599 return ngx_hash_init(hash, hide_headers.elts, hide_headers.nelts); |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3600 } |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3601 |
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
3602 |
509 | 3603 static void * |
3604 ngx_http_upstream_create_main_conf(ngx_conf_t *cf) | |
3605 { | |
3606 ngx_http_upstream_main_conf_t *umcf; | |
3607 | |
3608 umcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_main_conf_t)); | |
3609 if (umcf == NULL) { | |
3610 return NULL; | |
3611 } | |
3612 | |
651 | 3613 if (ngx_array_init(&umcf->upstreams, cf->pool, 4, |
3614 sizeof(ngx_http_upstream_srv_conf_t *)) | |
3615 != NGX_OK) | |
3616 { | |
3617 return NGX_CONF_ERROR; | |
3618 } | |
3619 | |
509 | 3620 return umcf; |
3621 } | |
3622 | |
3623 | |
3624 static char * | |
651 | 3625 ngx_http_upstream_init_main_conf(ngx_conf_t *cf, void *conf) |
509 | 3626 { |
3627 ngx_http_upstream_main_conf_t *umcf = conf; | |
3628 | |
651 | 3629 ngx_uint_t i; |
3630 ngx_array_t headers_in; | |
3631 ngx_hash_key_t *hk; | |
3632 ngx_hash_init_t hash; | |
884 | 3633 ngx_http_upstream_init_pt init; |
651 | 3634 ngx_http_upstream_header_t *header; |
3635 ngx_http_upstream_srv_conf_t **uscfp; | |
3636 | |
3637 uscfp = umcf->upstreams.elts; | |
3638 | |
3639 for (i = 0; i < umcf->upstreams.nelts; i++) { | |
884 | 3640 |
3641 init = uscfp[i]->peer.init_upstream ? uscfp[i]->peer.init_upstream: | |
3642 ngx_http_upstream_init_round_robin; | |
3643 | |
3644 if (init(cf, uscfp[i]) != NGX_OK) { | |
651 | 3645 return NGX_CONF_ERROR; |
3646 } | |
3647 } | |
649 | 3648 |
663 | 3649 |
884 | 3650 /* upstream_headers_in_hash */ |
3651 | |
649 | 3652 if (ngx_array_init(&headers_in, cf->temp_pool, 32, sizeof(ngx_hash_key_t)) |
3653 != NGX_OK) | |
509 | 3654 { |
3655 return NGX_CONF_ERROR; | |
3656 } | |
3657 | |
649 | 3658 for (header = ngx_http_upstream_headers_in; header->name.len; header++) { |
3659 hk = ngx_array_push(&headers_in); | |
3660 if (hk == NULL) { | |
3661 return NGX_CONF_ERROR; | |
3662 } | |
3663 | |
3664 hk->key = header->name; | |
3665 hk->key_hash = ngx_hash_key_lc(header->name.data, header->name.len); | |
3666 hk->value = header; | |
3667 } | |
3668 | |
3669 hash.hash = &umcf->headers_in_hash; | |
3670 hash.key = ngx_hash_key_lc; | |
3671 hash.max_size = 512; | |
751
bae59a740c40
align hash bucket size to cache line
Igor Sysoev <igor@sysoev.ru>
parents:
750
diff
changeset
|
3672 hash.bucket_size = ngx_align(64, ngx_cacheline_size); |
649 | 3673 hash.name = "upstream_headers_in_hash"; |
3674 hash.pool = cf->pool; | |
3675 hash.temp_pool = NULL; | |
3676 | |
3677 if (ngx_hash_init(&hash, headers_in.elts, headers_in.nelts) != NGX_OK) { | |
3678 return NGX_CONF_ERROR; | |
3679 } | |
509 | 3680 |
3681 return NGX_CONF_OK; | |
3682 } |