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