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