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