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