Mercurial > hg > nginx
annotate src/http/ngx_http_upstream.c @ 5008:fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
The "proxy_bind", "fastcgi_bind", "uwsgi_bind", "scgi_bind" and
"memcached_bind" directives are now inherited; inherited value
can be reset by the "off" parameter. Duplicate directives are
now detected. Parameter value can now contain variables.
| author | Ruslan Ermilov <ru@nginx.com> |
|---|---|
| date | Wed, 16 Jan 2013 09:42:57 +0000 |
| parents | c9059bd5445b |
| children | 7fa7e60a7f66 |
| rev | line source |
|---|---|
| 479 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4412 | 4 * Copyright (C) Nginx, Inc. |
| 479 | 5 */ |
| 6 | |
| 7 | |
| 8 #include <ngx_config.h> | |
| 9 #include <ngx_core.h> | |
| 10 #include <ngx_http.h> | |
| 11 | |
| 12 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
13 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
14 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
|
15 ngx_http_upstream_t *u); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
16 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
|
17 ngx_http_upstream_t *u); |
| 2952 | 18 static ngx_int_t ngx_http_upstream_cache_status(ngx_http_request_t *r, |
| 19 ngx_http_variable_value_t *v, uintptr_t data); | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
20 #endif |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
21 |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
22 static void ngx_http_upstream_init_request(ngx_http_request_t *r); |
| 1658 | 23 static void ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx); |
| 509 | 24 static void ngx_http_upstream_rd_check_broken_connection(ngx_http_request_t *r); |
| 25 static void ngx_http_upstream_wr_check_broken_connection(ngx_http_request_t *r); | |
| 26 static void ngx_http_upstream_check_broken_connection(ngx_http_request_t *r, | |
| 27 ngx_event_t *ev); | |
| 479 | 28 static void ngx_http_upstream_connect(ngx_http_request_t *r, |
| 487 | 29 ngx_http_upstream_t *u); |
| 509 | 30 static ngx_int_t ngx_http_upstream_reinit(ngx_http_request_t *r, |
| 487 | 31 ngx_http_upstream_t *u); |
| 479 | 32 static void ngx_http_upstream_send_request(ngx_http_request_t *r, |
| 487 | 33 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
|
34 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
|
35 ngx_http_upstream_t *u); |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
36 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
|
37 ngx_http_upstream_t *u); |
|
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
38 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
|
39 ngx_http_upstream_t *u); |
|
2267
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
40 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
|
41 ngx_http_upstream_t *u); |
|
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
42 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
|
43 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
|
44 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
|
45 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
|
46 ngx_http_upstream_t *u); |
| 479 | 47 static void ngx_http_upstream_send_response(ngx_http_request_t *r, |
| 487 | 48 ngx_http_upstream_t *u); |
| 581 | 49 static void |
| 50 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
|
51 static void |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
52 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
|
53 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
|
54 static void |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
55 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
|
56 ngx_uint_t do_write); |
| 581 | 57 static ngx_int_t ngx_http_upstream_non_buffered_filter_init(void *data); |
| 58 static ngx_int_t ngx_http_upstream_non_buffered_filter(void *data, | |
| 59 ssize_t bytes); | |
| 509 | 60 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
|
61 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
|
62 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
|
63 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
|
64 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
|
65 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
|
66 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
|
67 ngx_http_upstream_t *u); |
| 479 | 68 static void ngx_http_upstream_next(ngx_http_request_t *r, |
| 487 | 69 ngx_http_upstream_t *u, ngx_uint_t ft_type); |
| 569 | 70 static void ngx_http_upstream_cleanup(void *data); |
| 479 | 71 static void ngx_http_upstream_finalize_request(ngx_http_request_t *r, |
| 487 | 72 ngx_http_upstream_t *u, ngx_int_t rc); |
| 479 | 73 |
| 509 | 74 static ngx_int_t ngx_http_upstream_process_header_line(ngx_http_request_t *r, |
| 75 ngx_table_elt_t *h, ngx_uint_t offset); | |
|
4117
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
76 static ngx_int_t ngx_http_upstream_process_content_length(ngx_http_request_t *r, |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
77 ngx_table_elt_t *h, ngx_uint_t offset); |
|
3669
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
78 static ngx_int_t ngx_http_upstream_process_set_cookie(ngx_http_request_t *r, |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
79 ngx_table_elt_t *h, ngx_uint_t offset); |
| 509 | 80 static ngx_int_t |
|
2669
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
81 ngx_http_upstream_process_cache_control(ngx_http_request_t *r, |
| 509 | 82 ngx_table_elt_t *h, ngx_uint_t offset); |
| 83 static ngx_int_t ngx_http_upstream_ignore_header_line(ngx_http_request_t *r, | |
| 84 ngx_table_elt_t *h, ngx_uint_t offset); | |
| 2666 | 85 static ngx_int_t ngx_http_upstream_process_expires(ngx_http_request_t *r, |
| 86 ngx_table_elt_t *h, ngx_uint_t offset); | |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
87 static ngx_int_t ngx_http_upstream_process_accel_expires(ngx_http_request_t *r, |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
88 ngx_table_elt_t *h, ngx_uint_t offset); |
| 527 | 89 static ngx_int_t ngx_http_upstream_process_limit_rate(ngx_http_request_t *r, |
| 90 ngx_table_elt_t *h, ngx_uint_t offset); | |
| 649 | 91 static ngx_int_t ngx_http_upstream_process_buffering(ngx_http_request_t *r, |
| 509 | 92 ngx_table_elt_t *h, ngx_uint_t offset); |
| 657 | 93 static ngx_int_t ngx_http_upstream_process_charset(ngx_http_request_t *r, |
| 94 ngx_table_elt_t *h, ngx_uint_t offset); | |
|
4124
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
95 static ngx_int_t ngx_http_upstream_process_connection(ngx_http_request_t *r, |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
96 ngx_table_elt_t *h, ngx_uint_t offset); |
|
4123
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
97 static ngx_int_t |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
98 ngx_http_upstream_process_transfer_encoding(ngx_http_request_t *r, |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
99 ngx_table_elt_t *h, ngx_uint_t offset); |
| 649 | 100 static ngx_int_t ngx_http_upstream_copy_header_line(ngx_http_request_t *r, |
| 509 | 101 ngx_table_elt_t *h, ngx_uint_t offset); |
| 102 static ngx_int_t | |
| 103 ngx_http_upstream_copy_multi_header_lines(ngx_http_request_t *r, | |
| 104 ngx_table_elt_t *h, ngx_uint_t offset); | |
| 105 static ngx_int_t ngx_http_upstream_copy_content_type(ngx_http_request_t *r, | |
| 106 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
|
107 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
|
108 ngx_table_elt_t *h, ngx_uint_t offset); |
| 509 | 109 static ngx_int_t ngx_http_upstream_rewrite_location(ngx_http_request_t *r, |
| 110 ngx_table_elt_t *h, ngx_uint_t offset); | |
| 111 static ngx_int_t ngx_http_upstream_rewrite_refresh(ngx_http_request_t *r, | |
| 112 ngx_table_elt_t *h, ngx_uint_t offset); | |
|
4464
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
113 static ngx_int_t ngx_http_upstream_rewrite_set_cookie(ngx_http_request_t *r, |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
114 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
|
115 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
|
116 ngx_table_elt_t *h, ngx_uint_t offset); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
117 |
| 509 | 118 #if (NGX_HTTP_GZIP) |
| 119 static ngx_int_t ngx_http_upstream_copy_content_encoding(ngx_http_request_t *r, | |
| 120 ngx_table_elt_t *h, ngx_uint_t offset); | |
| 121 #endif | |
| 122 | |
| 573 | 123 static ngx_int_t ngx_http_upstream_add_variables(ngx_conf_t *cf); |
| 1181 | 124 static ngx_int_t ngx_http_upstream_addr_variable(ngx_http_request_t *r, |
| 125 ngx_http_variable_value_t *v, uintptr_t data); | |
| 573 | 126 static ngx_int_t ngx_http_upstream_status_variable(ngx_http_request_t *r, |
| 127 ngx_http_variable_value_t *v, uintptr_t data); | |
| 128 static ngx_int_t ngx_http_upstream_response_time_variable(ngx_http_request_t *r, | |
| 129 ngx_http_variable_value_t *v, uintptr_t data); | |
| 2402 | 130 static ngx_int_t ngx_http_upstream_response_length_variable( |
| 131 ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data); | |
| 573 | 132 |
| 651 | 133 static char *ngx_http_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy); |
| 134 static char *ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, | |
| 135 void *conf); | |
| 136 | |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
137 static ngx_addr_t *ngx_http_upstream_get_local(ngx_http_request_t *r, |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
138 ngx_http_upstream_local_t *local); |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
139 |
| 509 | 140 static void *ngx_http_upstream_create_main_conf(ngx_conf_t *cf); |
| 651 | 141 static char *ngx_http_upstream_init_main_conf(ngx_conf_t *cf, void *conf); |
| 509 | 142 |
| 577 | 143 #if (NGX_HTTP_SSL) |
| 591 | 144 static void ngx_http_upstream_ssl_init_connection(ngx_http_request_t *, |
| 145 ngx_http_upstream_t *u, ngx_connection_t *c); | |
| 577 | 146 static void ngx_http_upstream_ssl_handshake(ngx_connection_t *c); |
| 147 #endif | |
| 148 | |
| 509 | 149 |
| 150 ngx_http_upstream_header_t ngx_http_upstream_headers_in[] = { | |
| 151 | |
| 152 { ngx_string("Status"), | |
| 153 ngx_http_upstream_process_header_line, | |
| 154 offsetof(ngx_http_upstream_headers_in_t, status), | |
| 649 | 155 ngx_http_upstream_copy_header_line, 0, 0 }, |
| 509 | 156 |
| 157 { ngx_string("Content-Type"), | |
| 158 ngx_http_upstream_process_header_line, | |
| 159 offsetof(ngx_http_upstream_headers_in_t, content_type), | |
| 673 | 160 ngx_http_upstream_copy_content_type, 0, 1 }, |
| 509 | 161 |
| 162 { ngx_string("Content-Length"), | |
|
4117
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
163 ngx_http_upstream_process_content_length, |
| 509 | 164 offsetof(ngx_http_upstream_headers_in_t, content_length), |
|
4117
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
165 ngx_http_upstream_ignore_header_line, 0, 0 }, |
| 509 | 166 |
| 167 { ngx_string("Date"), | |
| 168 ngx_http_upstream_process_header_line, | |
| 169 offsetof(ngx_http_upstream_headers_in_t, date), | |
| 649 | 170 ngx_http_upstream_copy_header_line, |
| 171 offsetof(ngx_http_headers_out_t, date), 0 }, | |
| 509 | 172 |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
173 { ngx_string("Last-Modified"), |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
174 ngx_http_upstream_process_header_line, |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
175 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
|
176 ngx_http_upstream_copy_last_modified, 0, 0 }, |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
177 |
| 3037 | 178 { ngx_string("ETag"), |
| 179 ngx_http_upstream_process_header_line, | |
| 180 offsetof(ngx_http_upstream_headers_in_t, etag), | |
| 181 ngx_http_upstream_copy_header_line, | |
| 182 offsetof(ngx_http_headers_out_t, etag), 0 }, | |
| 183 | |
| 509 | 184 { ngx_string("Server"), |
| 185 ngx_http_upstream_process_header_line, | |
| 186 offsetof(ngx_http_upstream_headers_in_t, server), | |
| 649 | 187 ngx_http_upstream_copy_header_line, |
| 188 offsetof(ngx_http_headers_out_t, server), 0 }, | |
| 509 | 189 |
| 529 | 190 { ngx_string("WWW-Authenticate"), |
| 191 ngx_http_upstream_process_header_line, | |
| 192 offsetof(ngx_http_upstream_headers_in_t, www_authenticate), | |
| 193 ngx_http_upstream_copy_header_line, 0, 0 }, | |
| 194 | |
| 509 | 195 { ngx_string("Location"), |
|
2140
dce5ddef5af9
if upstream sent a location header without status use 302
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
196 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
|
197 offsetof(ngx_http_upstream_headers_in_t, location), |
| 515 | 198 ngx_http_upstream_rewrite_location, 0, 0 }, |
| 509 | 199 |
| 200 { ngx_string("Refresh"), | |
| 201 ngx_http_upstream_ignore_header_line, 0, | |
| 515 | 202 ngx_http_upstream_rewrite_refresh, 0, 0 }, |
| 203 | |
| 204 { ngx_string("Set-Cookie"), | |
|
3669
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
205 ngx_http_upstream_process_set_cookie, 0, |
|
4464
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
206 ngx_http_upstream_rewrite_set_cookie, 0, 1 }, |
| 531 | 207 |
| 208 { ngx_string("Content-Disposition"), | |
| 209 ngx_http_upstream_ignore_header_line, 0, | |
| 210 ngx_http_upstream_copy_header_line, 0, 1 }, | |
| 509 | 211 |
| 212 { ngx_string("Cache-Control"), | |
|
2669
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
213 ngx_http_upstream_process_cache_control, 0, |
| 509 | 214 ngx_http_upstream_copy_multi_header_lines, |
| 515 | 215 offsetof(ngx_http_headers_out_t, cache_control), 1 }, |
| 509 | 216 |
| 573 | 217 { ngx_string("Expires"), |
| 2666 | 218 ngx_http_upstream_process_expires, 0, |
| 573 | 219 ngx_http_upstream_copy_header_line, |
| 220 offsetof(ngx_http_headers_out_t, expires), 1 }, | |
| 221 | |
| 577 | 222 { ngx_string("Accept-Ranges"), |
| 223 ngx_http_upstream_process_header_line, | |
| 224 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
|
225 ngx_http_upstream_copy_allow_ranges, |
| 577 | 226 offsetof(ngx_http_headers_out_t, accept_ranges), 1 }, |
| 227 | |
| 509 | 228 { ngx_string("Connection"), |
|
4124
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
229 ngx_http_upstream_process_connection, 0, |
| 515 | 230 ngx_http_upstream_ignore_header_line, 0, 0 }, |
| 509 | 231 |
| 641 | 232 { ngx_string("Keep-Alive"), |
| 233 ngx_http_upstream_ignore_header_line, 0, | |
| 234 ngx_http_upstream_ignore_header_line, 0, 0 }, | |
| 235 | |
| 509 | 236 { ngx_string("X-Powered-By"), |
| 237 ngx_http_upstream_ignore_header_line, 0, | |
| 649 | 238 ngx_http_upstream_copy_header_line, 0, 0 }, |
| 509 | 239 |
| 240 { ngx_string("X-Accel-Expires"), | |
| 2664 | 241 ngx_http_upstream_process_accel_expires, 0, |
| 649 | 242 ngx_http_upstream_copy_header_line, 0, 0 }, |
| 515 | 243 |
| 244 { ngx_string("X-Accel-Redirect"), | |
| 245 ngx_http_upstream_process_header_line, | |
| 246 offsetof(ngx_http_upstream_headers_in_t, x_accel_redirect), | |
|
3003
b630e7d095b3
allow to proxy_pass_header/fastcgi_pass_header "X-Accel-Redirect",
Igor Sysoev <igor@sysoev.ru>
parents:
2971
diff
changeset
|
247 ngx_http_upstream_copy_header_line, 0, 0 }, |
| 509 | 248 |
| 527 | 249 { ngx_string("X-Accel-Limit-Rate"), |
| 250 ngx_http_upstream_process_limit_rate, 0, | |
|
3003
b630e7d095b3
allow to proxy_pass_header/fastcgi_pass_header "X-Accel-Redirect",
Igor Sysoev <igor@sysoev.ru>
parents:
2971
diff
changeset
|
251 ngx_http_upstream_copy_header_line, 0, 0 }, |
| 527 | 252 |
| 649 | 253 { ngx_string("X-Accel-Buffering"), |
| 254 ngx_http_upstream_process_buffering, 0, | |
|
3003
b630e7d095b3
allow to proxy_pass_header/fastcgi_pass_header "X-Accel-Redirect",
Igor Sysoev <igor@sysoev.ru>
parents:
2971
diff
changeset
|
255 ngx_http_upstream_copy_header_line, 0, 0 }, |
| 649 | 256 |
| 657 | 257 { ngx_string("X-Accel-Charset"), |
| 258 ngx_http_upstream_process_charset, 0, | |
|
3003
b630e7d095b3
allow to proxy_pass_header/fastcgi_pass_header "X-Accel-Redirect",
Igor Sysoev <igor@sysoev.ru>
parents:
2971
diff
changeset
|
259 ngx_http_upstream_copy_header_line, 0, 0 }, |
| 657 | 260 |
|
4123
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
261 { ngx_string("Transfer-Encoding"), |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
262 ngx_http_upstream_process_transfer_encoding, 0, |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
263 ngx_http_upstream_ignore_header_line, 0, 0 }, |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
264 |
| 509 | 265 #if (NGX_HTTP_GZIP) |
| 266 { ngx_string("Content-Encoding"), | |
| 267 ngx_http_upstream_process_header_line, | |
| 268 offsetof(ngx_http_upstream_headers_in_t, content_encoding), | |
| 515 | 269 ngx_http_upstream_copy_content_encoding, 0, 0 }, |
| 509 | 270 #endif |
| 271 | |
| 515 | 272 { ngx_null_string, NULL, 0, NULL, 0, 0 } |
| 509 | 273 }; |
| 479 | 274 |
| 275 | |
| 651 | 276 static ngx_command_t ngx_http_upstream_commands[] = { |
| 277 | |
| 278 { ngx_string("upstream"), | |
| 279 NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE1, | |
| 280 ngx_http_upstream, | |
| 281 0, | |
| 282 0, | |
| 283 NULL }, | |
| 284 | |
| 285 { ngx_string("server"), | |
| 884 | 286 NGX_HTTP_UPS_CONF|NGX_CONF_1MORE, |
| 651 | 287 ngx_http_upstream_server, |
| 288 NGX_HTTP_SRV_CONF_OFFSET, | |
| 289 0, | |
| 290 NULL }, | |
| 291 | |
| 292 ngx_null_command | |
| 293 }; | |
| 294 | |
| 295 | |
| 296 static ngx_http_module_t ngx_http_upstream_module_ctx = { | |
| 573 | 297 ngx_http_upstream_add_variables, /* preconfiguration */ |
| 509 | 298 NULL, /* postconfiguration */ |
| 299 | |
| 300 ngx_http_upstream_create_main_conf, /* create main configuration */ | |
| 651 | 301 ngx_http_upstream_init_main_conf, /* init main configuration */ |
| 479 | 302 |
| 303 NULL, /* create server configuration */ | |
| 304 NULL, /* merge server configuration */ | |
| 305 | |
| 306 NULL, /* create location configuration */ | |
| 307 NULL /* merge location configuration */ | |
| 308 }; | |
| 577 | 309 |
| 479 | 310 |
| 311 ngx_module_t ngx_http_upstream_module = { | |
| 509 | 312 NGX_MODULE_V1, |
| 479 | 313 &ngx_http_upstream_module_ctx, /* module context */ |
| 651 | 314 ngx_http_upstream_commands, /* module directives */ |
| 479 | 315 NGX_HTTP_MODULE, /* module type */ |
| 541 | 316 NULL, /* init master */ |
| 479 | 317 NULL, /* init module */ |
| 541 | 318 NULL, /* init process */ |
| 319 NULL, /* init thread */ | |
| 320 NULL, /* exit thread */ | |
| 321 NULL, /* exit process */ | |
| 322 NULL, /* exit master */ | |
| 323 NGX_MODULE_V1_PADDING | |
| 479 | 324 }; |
| 325 | |
| 326 | |
| 573 | 327 static ngx_http_variable_t ngx_http_upstream_vars[] = { |
| 328 | |
| 1181 | 329 { 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
|
330 ngx_http_upstream_addr_variable, 0, |
|
3898
bd1222fb0192
allow to use $upstream_... variables in SSI
Igor Sysoev <igor@sysoev.ru>
parents:
3879
diff
changeset
|
331 NGX_HTTP_VAR_NOCACHEABLE, 0 }, |
| 1181 | 332 |
| 637 | 333 { 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
|
334 ngx_http_upstream_status_variable, 0, |
|
3898
bd1222fb0192
allow to use $upstream_... variables in SSI
Igor Sysoev <igor@sysoev.ru>
parents:
3879
diff
changeset
|
335 NGX_HTTP_VAR_NOCACHEABLE, 0 }, |
| 573 | 336 |
| 637 | 337 { 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
|
338 ngx_http_upstream_response_time_variable, 0, |
|
3898
bd1222fb0192
allow to use $upstream_... variables in SSI
Igor Sysoev <igor@sysoev.ru>
parents:
3879
diff
changeset
|
339 NGX_HTTP_VAR_NOCACHEABLE, 0 }, |
| 573 | 340 |
| 2402 | 341 { ngx_string("upstream_response_length"), NULL, |
| 342 ngx_http_upstream_response_length_variable, 0, | |
|
3898
bd1222fb0192
allow to use $upstream_... variables in SSI
Igor Sysoev <igor@sysoev.ru>
parents:
3879
diff
changeset
|
343 NGX_HTTP_VAR_NOCACHEABLE, 0 }, |
| 2402 | 344 |
|
2957
b4f39842523b
fix building --without-http-cache, broken in r2953
Igor Sysoev <igor@sysoev.ru>
parents:
2953
diff
changeset
|
345 #if (NGX_HTTP_CACHE) |
|
b4f39842523b
fix building --without-http-cache, broken in r2953
Igor Sysoev <igor@sysoev.ru>
parents:
2953
diff
changeset
|
346 |
| 2952 | 347 { ngx_string("upstream_cache_status"), NULL, |
| 348 ngx_http_upstream_cache_status, 0, | |
|
3898
bd1222fb0192
allow to use $upstream_... variables in SSI
Igor Sysoev <igor@sysoev.ru>
parents:
3879
diff
changeset
|
349 NGX_HTTP_VAR_NOCACHEABLE, 0 }, |
| 2952 | 350 |
|
2957
b4f39842523b
fix building --without-http-cache, broken in r2953
Igor Sysoev <igor@sysoev.ru>
parents:
2953
diff
changeset
|
351 #endif |
|
b4f39842523b
fix building --without-http-cache, broken in r2953
Igor Sysoev <igor@sysoev.ru>
parents:
2953
diff
changeset
|
352 |
| 637 | 353 { ngx_null_string, NULL, NULL, 0, 0, 0 } |
| 573 | 354 }; |
| 355 | |
| 356 | |
|
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
357 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
|
358 { 500, NGX_HTTP_UPSTREAM_FT_HTTP_500 }, |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
359 { 502, NGX_HTTP_UPSTREAM_FT_HTTP_502 }, |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
360 { 503, NGX_HTTP_UPSTREAM_FT_HTTP_503 }, |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
361 { 504, NGX_HTTP_UPSTREAM_FT_HTTP_504 }, |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
362 { 404, NGX_HTTP_UPSTREAM_FT_HTTP_404 }, |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
363 { 0, 0 } |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
364 }; |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
365 |
|
2875
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2874
diff
changeset
|
366 |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2874
diff
changeset
|
367 ngx_conf_bitmask_t ngx_http_upstream_cache_method_mask[] = { |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2874
diff
changeset
|
368 { ngx_string("GET"), NGX_HTTP_GET}, |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2874
diff
changeset
|
369 { ngx_string("HEAD"), NGX_HTTP_HEAD }, |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2874
diff
changeset
|
370 { ngx_string("POST"), NGX_HTTP_POST }, |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2874
diff
changeset
|
371 { ngx_null_string, 0 } |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2874
diff
changeset
|
372 }; |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2874
diff
changeset
|
373 |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2874
diff
changeset
|
374 |
|
3667
12bd9e26fadb
use shared ngx_http_upstream_ignore_headers_masks[]
Igor Sysoev <igor@sysoev.ru>
parents:
3527
diff
changeset
|
375 ngx_conf_bitmask_t ngx_http_upstream_ignore_headers_masks[] = { |
|
12bd9e26fadb
use shared ngx_http_upstream_ignore_headers_masks[]
Igor Sysoev <igor@sysoev.ru>
parents:
3527
diff
changeset
|
376 { ngx_string("X-Accel-Redirect"), NGX_HTTP_UPSTREAM_IGN_XA_REDIRECT }, |
|
12bd9e26fadb
use shared ngx_http_upstream_ignore_headers_masks[]
Igor Sysoev <igor@sysoev.ru>
parents:
3527
diff
changeset
|
377 { ngx_string("X-Accel-Expires"), NGX_HTTP_UPSTREAM_IGN_XA_EXPIRES }, |
|
4197
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
378 { ngx_string("X-Accel-Limit-Rate"), NGX_HTTP_UPSTREAM_IGN_XA_LIMIT_RATE }, |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
379 { ngx_string("X-Accel-Buffering"), NGX_HTTP_UPSTREAM_IGN_XA_BUFFERING }, |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
380 { ngx_string("X-Accel-Charset"), NGX_HTTP_UPSTREAM_IGN_XA_CHARSET }, |
|
3667
12bd9e26fadb
use shared ngx_http_upstream_ignore_headers_masks[]
Igor Sysoev <igor@sysoev.ru>
parents:
3527
diff
changeset
|
381 { ngx_string("Expires"), NGX_HTTP_UPSTREAM_IGN_EXPIRES }, |
|
12bd9e26fadb
use shared ngx_http_upstream_ignore_headers_masks[]
Igor Sysoev <igor@sysoev.ru>
parents:
3527
diff
changeset
|
382 { ngx_string("Cache-Control"), NGX_HTTP_UPSTREAM_IGN_CACHE_CONTROL }, |
|
3669
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
383 { ngx_string("Set-Cookie"), NGX_HTTP_UPSTREAM_IGN_SET_COOKIE }, |
|
3667
12bd9e26fadb
use shared ngx_http_upstream_ignore_headers_masks[]
Igor Sysoev <igor@sysoev.ru>
parents:
3527
diff
changeset
|
384 { ngx_null_string, 0 } |
|
12bd9e26fadb
use shared ngx_http_upstream_ignore_headers_masks[]
Igor Sysoev <igor@sysoev.ru>
parents:
3527
diff
changeset
|
385 }; |
|
12bd9e26fadb
use shared ngx_http_upstream_ignore_headers_masks[]
Igor Sysoev <igor@sysoev.ru>
parents:
3527
diff
changeset
|
386 |
|
12bd9e26fadb
use shared ngx_http_upstream_ignore_headers_masks[]
Igor Sysoev <igor@sysoev.ru>
parents:
3527
diff
changeset
|
387 |
|
3006
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
388 ngx_int_t |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
389 ngx_http_upstream_create(ngx_http_request_t *r) |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
390 { |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
391 ngx_http_upstream_t *u; |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
392 |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
393 u = r->upstream; |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
394 |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
395 if (u && u->cleanup) { |
|
3112
5ddc9458e4bb
increase request counter before an upstream cleanup because the cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
3083
diff
changeset
|
396 r->main->count++; |
|
3006
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
397 ngx_http_upstream_cleanup(r); |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
398 } |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
399 |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
400 u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t)); |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
401 if (u == NULL) { |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
402 return NGX_ERROR; |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
403 } |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
404 |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
405 r->upstream = u; |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
406 |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
407 u->peer.log = r->connection->log; |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
408 u->peer.log_error = NGX_ERROR_ERR; |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
409 #if (NGX_THREADS) |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
410 u->peer.lock = &r->connection->lock; |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
411 #endif |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
412 |
|
3056
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
413 #if (NGX_HTTP_CACHE) |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
414 r->cache = NULL; |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
415 #endif |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
416 |
|
4117
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
417 u->headers_in.content_length_n = -1; |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
418 |
|
3006
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
419 return NGX_OK; |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
420 } |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
421 |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
422 |
| 487 | 423 void |
| 424 ngx_http_upstream_init(ngx_http_request_t *r) | |
| 479 | 425 { |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
426 ngx_connection_t *c; |
| 479 | 427 |
| 428 c = r->connection; | |
| 429 | |
| 430 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, | |
| 431 "http init upstream, client timer: %d", c->read->timer_set); | |
| 432 | |
| 433 if (c->read->timer_set) { | |
| 434 ngx_del_timer(c->read); | |
| 435 } | |
| 436 | |
| 437 if (ngx_event_flags & NGX_USE_CLEAR_EVENT) { | |
| 438 | |
| 439 if (!c->write->active) { | |
| 531 | 440 if (ngx_add_event(c->write, NGX_WRITE_EVENT, NGX_CLEAR_EVENT) |
| 441 == NGX_ERROR) | |
| 479 | 442 { |
| 443 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 444 return; | |
| 445 } | |
| 446 } | |
| 447 } | |
| 448 | |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
449 ngx_http_upstream_init_request(r); |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
450 } |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
451 |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
452 |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
453 static void |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
454 ngx_http_upstream_init_request(ngx_http_request_t *r) |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
455 { |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
456 ngx_str_t *host; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
457 ngx_uint_t i; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
458 ngx_resolver_ctx_t *ctx, temp; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
459 ngx_http_cleanup_t *cln; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
460 ngx_http_upstream_t *u; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
461 ngx_http_core_loc_conf_t *clcf; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
462 ngx_http_upstream_srv_conf_t *uscf, **uscfp; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
463 ngx_http_upstream_main_conf_t *umcf; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
464 |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
465 if (r->aio) { |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
466 return; |
| 537 | 467 } |
| 509 | 468 |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
469 u = r->upstream; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
470 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
471 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
472 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
473 if (u->conf->cache) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
474 ngx_int_t rc; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
475 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
476 rc = ngx_http_upstream_cache(r, u); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
477 |
|
3055
92b6cfaa3c27
fix sending a cached file using AIO
Igor Sysoev <igor@sysoev.ru>
parents:
3053
diff
changeset
|
478 if (rc == NGX_BUSY) { |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
479 r->write_event_handler = ngx_http_upstream_init_request; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
480 return; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
481 } |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
482 |
|
3055
92b6cfaa3c27
fix sending a cached file using AIO
Igor Sysoev <igor@sysoev.ru>
parents:
3053
diff
changeset
|
483 r->write_event_handler = ngx_http_request_empty_handler; |
|
92b6cfaa3c27
fix sending a cached file using AIO
Igor Sysoev <igor@sysoev.ru>
parents:
3053
diff
changeset
|
484 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
485 if (rc == NGX_DONE) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
486 return; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
487 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
488 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
489 if (rc != NGX_DECLINED) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
490 ngx_http_finalize_request(r, rc); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
491 return; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
492 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
493 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
494 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
495 #endif |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
496 |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
497 u->store = (u->conf->store || u->conf->store_lengths); |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
498 |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
499 if (!u->store && !r->post_action && !u->conf->ignore_client_abort) { |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
500 r->read_event_handler = ngx_http_upstream_rd_check_broken_connection; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
501 r->write_event_handler = ngx_http_upstream_wr_check_broken_connection; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
502 } |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
503 |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
504 if (r->request_body) { |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
505 u->request_bufs = r->request_body->bufs; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
506 } |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
507 |
| 537 | 508 if (u->create_request(r) != NGX_OK) { |
| 479 | 509 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); |
| 510 return; | |
| 511 } | |
| 512 | |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
513 u->peer.local = ngx_http_upstream_get_local(r, u->conf->local); |
|
3271
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
514 |
| 509 | 515 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
| 479 | 516 |
| 3053 | 517 u->output.alignment = clcf->directio_alignment; |
| 479 | 518 u->output.pool = r->pool; |
| 519 u->output.bufs.num = 1; | |
| 509 | 520 u->output.bufs.size = clcf->client_body_buffer_size; |
| 479 | 521 u->output.output_filter = ngx_chain_writer; |
| 522 u->output.filter_ctx = &u->writer; | |
| 523 | |
| 524 u->writer.pool = r->pool; | |
| 525 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
526 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
|
527 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
528 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
|
529 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
|
530 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
|
531 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
|
532 return; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
533 } |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
534 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
535 } else { |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
536 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
537 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
|
538 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
|
539 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
|
540 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
|
541 return; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
542 } |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
543 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
544 ngx_memzero(u->state, sizeof(ngx_http_upstream_state_t)); |
| 479 | 545 } |
| 546 | |
| 593 | 547 cln = ngx_http_cleanup_add(r, 0); |
| 569 | 548 if (cln == NULL) { |
| 549 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 550 return; | |
| 551 } | |
| 552 | |
| 553 cln->handler = ngx_http_upstream_cleanup; | |
| 554 cln->data = r; | |
| 555 u->cleanup = &cln->handler; | |
| 556 | |
| 1658 | 557 if (u->resolved == NULL) { |
| 558 | |
| 559 uscf = u->conf->upstream; | |
| 560 | |
| 561 } else { | |
| 562 | |
|
2422
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
563 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
|
564 |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
565 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
|
566 != NGX_OK) |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
567 { |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
568 ngx_http_upstream_finalize_request(r, u, |
|
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
569 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
2422
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
570 return; |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
571 } |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
572 |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
573 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
|
574 |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
575 return; |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
576 } |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
577 |
| 1705 | 578 host = &u->resolved->host; |
| 1658 | 579 |
| 580 umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module); | |
| 581 | |
| 582 uscfp = umcf->upstreams.elts; | |
| 583 | |
| 584 for (i = 0; i < umcf->upstreams.nelts; i++) { | |
| 585 | |
| 586 uscf = uscfp[i]; | |
| 587 | |
| 588 if (uscf->host.len == host->len | |
| 2285 | 589 && ((uscf->port == 0 && u->resolved->no_port) |
| 1912 | 590 || uscf->port == u->resolved->port) |
| 1658 | 591 && ngx_memcmp(uscf->host.data, host->data, host->len) == 0) |
| 592 { | |
| 593 goto found; | |
| 594 } | |
| 595 } | |
| 596 | |
|
3879
502a6b0acf3f
fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass
Igor Sysoev <igor@sysoev.ru>
parents:
3713
diff
changeset
|
597 if (u->resolved->port == 0) { |
|
502a6b0acf3f
fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass
Igor Sysoev <igor@sysoev.ru>
parents:
3713
diff
changeset
|
598 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
502a6b0acf3f
fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass
Igor Sysoev <igor@sysoev.ru>
parents:
3713
diff
changeset
|
599 "no port in upstream \"%V\"", host); |
|
502a6b0acf3f
fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass
Igor Sysoev <igor@sysoev.ru>
parents:
3713
diff
changeset
|
600 ngx_http_upstream_finalize_request(r, u, |
|
502a6b0acf3f
fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass
Igor Sysoev <igor@sysoev.ru>
parents:
3713
diff
changeset
|
601 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
502a6b0acf3f
fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass
Igor Sysoev <igor@sysoev.ru>
parents:
3713
diff
changeset
|
602 return; |
|
502a6b0acf3f
fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass
Igor Sysoev <igor@sysoev.ru>
parents:
3713
diff
changeset
|
603 } |
|
502a6b0acf3f
fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass
Igor Sysoev <igor@sysoev.ru>
parents:
3713
diff
changeset
|
604 |
| 1658 | 605 temp.name = *host; |
| 606 | |
| 607 ctx = ngx_resolve_start(clcf->resolver, &temp); | |
| 608 if (ctx == NULL) { | |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
609 ngx_http_upstream_finalize_request(r, u, |
|
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
610 NGX_HTTP_INTERNAL_SERVER_ERROR); |
| 1658 | 611 return; |
| 612 } | |
| 613 | |
|
1683
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
614 if (ctx == NGX_NO_RESOLVER) { |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
615 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
1683
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
616 "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
|
617 |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
618 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY); |
|
1683
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
619 return; |
|
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
620 } |
|
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
621 |
| 1658 | 622 ctx->name = *host; |
| 623 ctx->type = NGX_RESOLVE_A; | |
| 624 ctx->handler = ngx_http_upstream_resolve_handler; | |
| 625 ctx->data = r; | |
| 626 ctx->timeout = clcf->resolver_timeout; | |
| 627 | |
|
1959
4f16186f5603
quick resolving handles u->resolved->ctx by itself
Igor Sysoev <igor@sysoev.ru>
parents:
1958
diff
changeset
|
628 u->resolved->ctx = ctx; |
|
4f16186f5603
quick resolving handles u->resolved->ctx by itself
Igor Sysoev <igor@sysoev.ru>
parents:
1958
diff
changeset
|
629 |
| 1658 | 630 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
|
631 u->resolved->ctx = NULL; |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
632 ngx_http_upstream_finalize_request(r, u, |
|
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
633 NGX_HTTP_INTERNAL_SERVER_ERROR); |
| 1658 | 634 return; |
| 635 } | |
| 636 | |
| 637 return; | |
| 638 } | |
| 639 | |
| 640 found: | |
| 641 | |
|
4964
2464ccebdb52
Upstream: fixed SIGSEGV with the "if" directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4916
diff
changeset
|
642 if (uscf == NULL) { |
|
2464ccebdb52
Upstream: fixed SIGSEGV with the "if" directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4916
diff
changeset
|
643 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, |
|
2464ccebdb52
Upstream: fixed SIGSEGV with the "if" directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4916
diff
changeset
|
644 "no upstream configuration"); |
|
2464ccebdb52
Upstream: fixed SIGSEGV with the "if" directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4916
diff
changeset
|
645 ngx_http_upstream_finalize_request(r, u, |
|
2464ccebdb52
Upstream: fixed SIGSEGV with the "if" directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4916
diff
changeset
|
646 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
2464ccebdb52
Upstream: fixed SIGSEGV with the "if" directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4916
diff
changeset
|
647 return; |
|
2464ccebdb52
Upstream: fixed SIGSEGV with the "if" directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4916
diff
changeset
|
648 } |
|
2464ccebdb52
Upstream: fixed SIGSEGV with the "if" directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4916
diff
changeset
|
649 |
| 1658 | 650 if (uscf->peer.init(r, uscf) != NGX_OK) { |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
651 ngx_http_upstream_finalize_request(r, u, |
|
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
652 NGX_HTTP_INTERNAL_SERVER_ERROR); |
| 1658 | 653 return; |
| 654 } | |
| 655 | |
| 479 | 656 ngx_http_upstream_connect(r, u); |
| 657 } | |
| 658 | |
| 659 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
660 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
661 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
662 static ngx_int_t |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
663 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
|
664 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
665 ngx_int_t rc; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
666 ngx_http_cache_t *c; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
667 |
|
3056
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
668 c = r->cache; |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
669 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
670 if (c == NULL) { |
|
3056
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
671 |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
672 if (!(r->method & u->conf->cache_methods)) { |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
673 return NGX_DECLINED; |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
674 } |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
675 |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
676 if (r->method & NGX_HTTP_HEAD) { |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
677 u->method = ngx_http_core_get_method; |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
678 } |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
679 |
|
3698
d11227f0107f
rename ngx_http_file_cache_create() to ngx_http_file_cache_new()
Igor Sysoev <igor@sysoev.ru>
parents:
3697
diff
changeset
|
680 if (ngx_http_file_cache_new(r) != NGX_OK) { |
|
3056
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
681 return NGX_ERROR; |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
682 } |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
683 |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
684 if (u->create_key(r) != NGX_OK) { |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
685 return NGX_ERROR; |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
686 } |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
687 |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
688 /* TODO: add keys */ |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
689 |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
690 ngx_http_file_cache_create_key(r); |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
691 |
|
3976
215fe9223419
update r3945 with more descriptive error message
Igor Sysoev <igor@sysoev.ru>
parents:
3963
diff
changeset
|
692 if (r->cache->header_start + 256 >= u->conf->buffer_size) { |
|
3944
f1f194ceab16
fix segfault if cache key is larger than upstream buffer size
Igor Sysoev <igor@sysoev.ru>
parents:
3940
diff
changeset
|
693 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
3976
215fe9223419
update r3945 with more descriptive error message
Igor Sysoev <igor@sysoev.ru>
parents:
3963
diff
changeset
|
694 "%V_buffer_size %uz is not enough for cache key, " |
|
215fe9223419
update r3945 with more descriptive error message
Igor Sysoev <igor@sysoev.ru>
parents:
3963
diff
changeset
|
695 "it should increased at least to %uz", |
|
215fe9223419
update r3945 with more descriptive error message
Igor Sysoev <igor@sysoev.ru>
parents:
3963
diff
changeset
|
696 &u->conf->module, u->conf->buffer_size, |
|
215fe9223419
update r3945 with more descriptive error message
Igor Sysoev <igor@sysoev.ru>
parents:
3963
diff
changeset
|
697 ngx_align(r->cache->header_start + 256, 1024)); |
|
3944
f1f194ceab16
fix segfault if cache key is larger than upstream buffer size
Igor Sysoev <igor@sysoev.ru>
parents:
3940
diff
changeset
|
698 |
|
f1f194ceab16
fix segfault if cache key is larger than upstream buffer size
Igor Sysoev <igor@sysoev.ru>
parents:
3940
diff
changeset
|
699 r->cache = NULL; |
|
f1f194ceab16
fix segfault if cache key is larger than upstream buffer size
Igor Sysoev <igor@sysoev.ru>
parents:
3940
diff
changeset
|
700 return NGX_DECLINED; |
|
f1f194ceab16
fix segfault if cache key is larger than upstream buffer size
Igor Sysoev <igor@sysoev.ru>
parents:
3940
diff
changeset
|
701 } |
|
f1f194ceab16
fix segfault if cache key is larger than upstream buffer size
Igor Sysoev <igor@sysoev.ru>
parents:
3940
diff
changeset
|
702 |
|
4176
2b5151a2300b
Fixed cache bypass caching of non-cacheable replies (ticket #21).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4152
diff
changeset
|
703 u->cacheable = 1; |
|
2b5151a2300b
Fixed cache bypass caching of non-cacheable replies (ticket #21).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4152
diff
changeset
|
704 |
|
3917
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
705 switch (ngx_http_test_predicates(r, u->conf->cache_bypass)) { |
|
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
706 |
|
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
707 case NGX_ERROR: |
|
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
708 return NGX_ERROR; |
|
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
709 |
|
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
710 case NGX_DECLINED: |
|
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
711 u->cache_status = NGX_HTTP_CACHE_BYPASS; |
|
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
712 return NGX_DECLINED; |
|
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
713 |
|
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
714 default: /* NGX_OK */ |
|
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
715 break; |
|
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
716 } |
|
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
717 |
| 3697 | 718 c = r->cache; |
| 719 | |
|
3056
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
720 c->min_uses = u->conf->cache_min_uses; |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
721 c->body_start = u->conf->buffer_size; |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
722 c->file_cache = u->conf->cache->data; |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
723 |
|
4385
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4375
diff
changeset
|
724 c->lock = u->conf->cache_lock; |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4375
diff
changeset
|
725 c->lock_timeout = u->conf->cache_lock_timeout; |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4375
diff
changeset
|
726 |
|
3056
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
727 u->cache_status = NGX_HTTP_CACHE_MISS; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
728 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
729 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
730 rc = ngx_http_file_cache_open(r); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
731 |
|
2926
80a314b63c56
delete useless r->cache->uses
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
732 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
80a314b63c56
delete useless r->cache->uses
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
733 "http upstream cache: %i", rc); |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
734 |
| 2952 | 735 switch (rc) { |
| 736 | |
| 737 case NGX_HTTP_CACHE_UPDATING: | |
| 738 | |
|
2927
55ceaef03d34
proxy_cache_use_stale/fastcgi_cache_use_stale updating
Igor Sysoev <igor@sysoev.ru>
parents:
2926
diff
changeset
|
739 if (u->conf->cache_use_stale & NGX_HTTP_UPSTREAM_FT_UPDATING) { |
| 2952 | 740 u->cache_status = rc; |
|
2927
55ceaef03d34
proxy_cache_use_stale/fastcgi_cache_use_stale updating
Igor Sysoev <igor@sysoev.ru>
parents:
2926
diff
changeset
|
741 rc = NGX_OK; |
|
55ceaef03d34
proxy_cache_use_stale/fastcgi_cache_use_stale updating
Igor Sysoev <igor@sysoev.ru>
parents:
2926
diff
changeset
|
742 |
|
55ceaef03d34
proxy_cache_use_stale/fastcgi_cache_use_stale updating
Igor Sysoev <igor@sysoev.ru>
parents:
2926
diff
changeset
|
743 } else { |
|
55ceaef03d34
proxy_cache_use_stale/fastcgi_cache_use_stale updating
Igor Sysoev <igor@sysoev.ru>
parents:
2926
diff
changeset
|
744 rc = NGX_HTTP_CACHE_STALE; |
|
55ceaef03d34
proxy_cache_use_stale/fastcgi_cache_use_stale updating
Igor Sysoev <igor@sysoev.ru>
parents:
2926
diff
changeset
|
745 } |
| 2952 | 746 |
| 747 break; | |
| 748 | |
| 749 case NGX_OK: | |
| 750 u->cache_status = NGX_HTTP_CACHE_HIT; | |
|
2927
55ceaef03d34
proxy_cache_use_stale/fastcgi_cache_use_stale updating
Igor Sysoev <igor@sysoev.ru>
parents:
2926
diff
changeset
|
751 } |
|
55ceaef03d34
proxy_cache_use_stale/fastcgi_cache_use_stale updating
Igor Sysoev <igor@sysoev.ru>
parents:
2926
diff
changeset
|
752 |
| 2952 | 753 switch (rc) { |
| 754 | |
| 755 case NGX_OK: | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
756 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
757 rc = ngx_http_upstream_cache_send(r, u); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
758 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
759 if (rc != NGX_HTTP_UPSTREAM_INVALID_HEADER) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
760 return rc; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
761 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
762 |
| 2952 | 763 break; |
| 764 | |
| 765 case NGX_HTTP_CACHE_STALE: | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
766 |
|
2665
4d627567c324
fix r2664: ..._cache_valid did not work for stale responses
Igor Sysoev <igor@sysoev.ru>
parents:
2664
diff
changeset
|
767 c->valid_sec = 0; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
768 u->buffer.start = NULL; |
| 2952 | 769 u->cache_status = NGX_HTTP_CACHE_EXPIRED; |
| 770 | |
| 771 break; | |
| 772 | |
| 773 case NGX_DECLINED: | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
774 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
775 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
|
776 u->buffer.start = NULL; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
777 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
778 } else { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
779 u->buffer.pos = u->buffer.start + c->header_start; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
780 u->buffer.last = u->buffer.pos; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
781 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
782 |
| 2952 | 783 break; |
| 784 | |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
785 case NGX_HTTP_CACHE_SCARCE: |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
786 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
787 u->cacheable = 0; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
788 |
| 2952 | 789 break; |
| 790 | |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
791 case NGX_AGAIN: |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
792 |
|
3055
92b6cfaa3c27
fix sending a cached file using AIO
Igor Sysoev <igor@sysoev.ru>
parents:
3053
diff
changeset
|
793 return NGX_BUSY; |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
794 |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
795 case NGX_ERROR: |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
796 |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
797 return NGX_ERROR; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
798 |
| 2952 | 799 default: |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
800 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
801 /* 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
|
802 |
| 2952 | 803 u->cache_status = NGX_HTTP_CACHE_HIT; |
| 804 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
805 return rc; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
806 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
807 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
808 r->cached = 0; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
809 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
810 return NGX_DECLINED; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
811 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
812 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
813 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
814 static ngx_int_t |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
815 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
|
816 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
817 ngx_int_t rc; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
818 ngx_http_cache_t *c; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
819 |
| 2952 | 820 r->cached = 1; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
821 c = r->cache; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
822 |
|
3369
479468a7d982
fix handling cached HTTP/0.9 response
Igor Sysoev <igor@sysoev.ru>
parents:
3272
diff
changeset
|
823 if (c->header_start == c->body_start) { |
|
479468a7d982
fix handling cached HTTP/0.9 response
Igor Sysoev <igor@sysoev.ru>
parents:
3272
diff
changeset
|
824 r->http_version = NGX_HTTP_VERSION_9; |
|
479468a7d982
fix handling cached HTTP/0.9 response
Igor Sysoev <igor@sysoev.ru>
parents:
3272
diff
changeset
|
825 return ngx_http_cache_send(r); |
|
479468a7d982
fix handling cached HTTP/0.9 response
Igor Sysoev <igor@sysoev.ru>
parents:
3272
diff
changeset
|
826 } |
|
479468a7d982
fix handling cached HTTP/0.9 response
Igor Sysoev <igor@sysoev.ru>
parents:
3272
diff
changeset
|
827 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
828 /* TODO: cache stack */ |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
829 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
830 u->buffer = *c->buf; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
831 u->buffer.pos += c->header_start; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
832 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
833 ngx_memzero(&u->headers_in, sizeof(ngx_http_upstream_headers_in_t)); |
|
4117
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
834 u->headers_in.content_length_n = -1; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
835 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
836 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
|
837 sizeof(ngx_table_elt_t)) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
838 != NGX_OK) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
839 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
840 return NGX_ERROR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
841 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
842 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
843 rc = u->process_header(r); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
844 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
845 if (rc == NGX_OK) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
846 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
847 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
|
848 return NGX_DONE; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
849 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
850 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
851 return ngx_http_cache_send(r); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
852 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
853 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
854 if (rc == NGX_ERROR) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
855 return NGX_ERROR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
856 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
857 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
858 /* rc == NGX_HTTP_UPSTREAM_INVALID_HEADER */ |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
859 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
860 /* TODO: delete file */ |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
861 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
862 return rc; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
863 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
864 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
865 #endif |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
866 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
867 |
| 487 | 868 static void |
| 1658 | 869 ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx) |
| 870 { | |
| 871 ngx_http_request_t *r; | |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
872 ngx_http_upstream_t *u; |
| 1658 | 873 ngx_http_upstream_resolved_t *ur; |
| 874 | |
| 875 r = ctx->data; | |
| 876 | |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
877 u = r->upstream; |
|
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
878 ur = u->resolved; |
| 1658 | 879 |
| 880 if (ctx->state) { | |
| 881 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 882 "%V could not be resolved (%i: %s)", | |
| 883 &ctx->name, ctx->state, | |
| 884 ngx_resolver_strerror(ctx->state)); | |
| 885 | |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
886 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY); |
| 1658 | 887 return; |
| 888 } | |
| 889 | |
| 890 ur->naddrs = ctx->naddrs; | |
| 891 ur->addrs = ctx->addrs; | |
| 892 | |
| 893 #if (NGX_DEBUG) | |
| 894 { | |
| 895 in_addr_t addr; | |
| 896 ngx_uint_t i; | |
| 897 | |
| 898 for (i = 0; i < ctx->naddrs; i++) { | |
| 899 addr = ntohl(ur->addrs[i]); | |
| 900 | |
| 901 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 902 "name was resolved to %ud.%ud.%ud.%ud", | |
| 903 (addr >> 24) & 0xff, (addr >> 16) & 0xff, | |
| 904 (addr >> 8) & 0xff, addr & 0xff); | |
| 905 } | |
| 906 } | |
| 907 #endif | |
| 908 | |
| 909 if (ngx_http_upstream_create_round_robin_peer(r, ur) != NGX_OK) { | |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
910 ngx_http_upstream_finalize_request(r, u, |
|
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
911 NGX_HTTP_INTERNAL_SERVER_ERROR); |
| 1658 | 912 return; |
| 913 } | |
| 914 | |
| 915 ngx_resolve_name_done(ctx); | |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
916 ur->ctx = NULL; |
|
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
917 |
|
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
918 ngx_http_upstream_connect(r, u); |
| 1658 | 919 } |
| 920 | |
| 921 | |
| 922 static void | |
|
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
923 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
|
924 { |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
925 ngx_connection_t *c; |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
926 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
|
927 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
|
928 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
|
929 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
930 c = ev->data; |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
931 r = c->data; |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
932 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
933 u = r->upstream; |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
934 c = r->connection; |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
935 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
936 ctx = c->log->data; |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
937 ctx->current_request = r; |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
938 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
939 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
|
940 "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
|
941 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
942 if (ev->write) { |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
943 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
|
944 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
945 } else { |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
946 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
|
947 } |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
948 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
949 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
|
950 } |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
951 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
952 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
953 static void |
| 509 | 954 ngx_http_upstream_rd_check_broken_connection(ngx_http_request_t *r) |
| 955 { | |
| 956 ngx_http_upstream_check_broken_connection(r, r->connection->read); | |
| 957 } | |
| 958 | |
| 959 | |
| 960 static void | |
| 961 ngx_http_upstream_wr_check_broken_connection(ngx_http_request_t *r) | |
| 962 { | |
| 963 ngx_http_upstream_check_broken_connection(r, r->connection->write); | |
| 964 } | |
| 965 | |
| 966 | |
| 967 static void | |
| 968 ngx_http_upstream_check_broken_connection(ngx_http_request_t *r, | |
| 969 ngx_event_t *ev) | |
| 479 | 970 { |
| 971 int n; | |
| 972 char buf[1]; | |
| 577 | 973 ngx_err_t err; |
|
2807
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
974 ngx_int_t event; |
| 479 | 975 ngx_connection_t *c; |
| 976 ngx_http_upstream_t *u; | |
| 977 | |
| 527 | 978 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ev->log, 0, |
| 979 "http upstream check client, write event:%d, \"%V\"", | |
| 980 ev->write, &r->uri); | |
| 479 | 981 |
| 509 | 982 c = r->connection; |
| 483 | 983 u = r->upstream; |
| 984 | |
| 583 | 985 if (c->error) { |
|
2807
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
986 if ((ngx_event_flags & NGX_USE_LEVEL_EVENT) && ev->active) { |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
987 |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
988 event = ev->write ? NGX_WRITE_EVENT : NGX_READ_EVENT; |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
989 |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
990 if (ngx_del_event(ev, event, 0) != NGX_OK) { |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
991 ngx_http_upstream_finalize_request(r, u, |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
992 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
993 return; |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
994 } |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
995 } |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
996 |
|
2757
9cc973b46af1
get a full response if the response is cacheable or storable even
Igor Sysoev <igor@sysoev.ru>
parents:
2708
diff
changeset
|
997 if (!u->cacheable) { |
|
9cc973b46af1
get a full response if the response is cacheable or storable even
Igor Sysoev <igor@sysoev.ru>
parents:
2708
diff
changeset
|
998 ngx_http_upstream_finalize_request(r, u, |
|
9cc973b46af1
get a full response if the response is cacheable or storable even
Igor Sysoev <igor@sysoev.ru>
parents:
2708
diff
changeset
|
999 NGX_HTTP_CLIENT_CLOSED_REQUEST); |
|
9cc973b46af1
get a full response if the response is cacheable or storable even
Igor Sysoev <igor@sysoev.ru>
parents:
2708
diff
changeset
|
1000 } |
|
2807
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
1001 |
| 527 | 1002 return; |
| 1003 } | |
| 1004 | |
| 479 | 1005 #if (NGX_HAVE_KQUEUE) |
| 1006 | |
| 1007 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { | |
| 1008 | |
| 1009 if (!ev->pending_eof) { | |
| 1010 return; | |
| 1011 } | |
| 1012 | |
| 1013 ev->eof = 1; | |
| 583 | 1014 c->error = 1; |
| 479 | 1015 |
| 1016 if (ev->kq_errno) { | |
| 1017 ev->error = 1; | |
| 1018 } | |
| 1019 | |
|
2757
9cc973b46af1
get a full response if the response is cacheable or storable even
Igor Sysoev <igor@sysoev.ru>
parents:
2708
diff
changeset
|
1020 if (!u->cacheable && u->peer.connection) { |
| 479 | 1021 ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno, |
| 4182 | 1022 "kevent() reported that client prematurely closed " |
| 527 | 1023 "connection, so upstream connection is closed too"); |
| 479 | 1024 ngx_http_upstream_finalize_request(r, u, |
| 1025 NGX_HTTP_CLIENT_CLOSED_REQUEST); | |
| 1026 return; | |
| 1027 } | |
| 1028 | |
| 1029 ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno, | |
| 4182 | 1030 "kevent() reported that client prematurely closed " |
| 1031 "connection"); | |
| 479 | 1032 |
| 1033 if (u->peer.connection == NULL) { | |
| 1034 ngx_http_upstream_finalize_request(r, u, | |
| 1035 NGX_HTTP_CLIENT_CLOSED_REQUEST); | |
| 1036 } | |
| 1037 | |
| 1038 return; | |
| 1039 } | |
| 1040 | |
| 1041 #endif | |
| 1042 | |
| 1043 n = recv(c->fd, buf, 1, MSG_PEEK); | |
| 1044 | |
| 1045 err = ngx_socket_errno; | |
| 1046 | |
| 1109 | 1047 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, err, |
| 1048 "http upstream recv(): %d", n); | |
| 1049 | |
| 479 | 1050 if (ev->write && (n >= 0 || err == NGX_EAGAIN)) { |
| 1051 return; | |
| 1052 } | |
| 1053 | |
| 1054 if ((ngx_event_flags & NGX_USE_LEVEL_EVENT) && ev->active) { | |
|
2807
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
1055 |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
1056 event = ev->write ? NGX_WRITE_EVENT : NGX_READ_EVENT; |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
1057 |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
1058 if (ngx_del_event(ev, event, 0) != NGX_OK) { |
| 479 | 1059 ngx_http_upstream_finalize_request(r, u, |
| 1060 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1061 return; | |
| 1062 } | |
| 1063 } | |
| 1064 | |
| 1065 if (n > 0) { | |
| 1066 return; | |
| 1067 } | |
| 1068 | |
| 1069 if (n == -1) { | |
| 1070 if (err == NGX_EAGAIN) { | |
| 1071 return; | |
| 1072 } | |
| 1073 | |
| 1074 ev->error = 1; | |
| 1075 | |
| 483 | 1076 } else { /* n == 0 */ |
| 479 | 1077 err = 0; |
| 1078 } | |
| 1079 | |
| 529 | 1080 ev->eof = 1; |
| 583 | 1081 c->error = 1; |
| 529 | 1082 |
|
2757
9cc973b46af1
get a full response if the response is cacheable or storable even
Igor Sysoev <igor@sysoev.ru>
parents:
2708
diff
changeset
|
1083 if (!u->cacheable && u->peer.connection) { |
| 479 | 1084 ngx_log_error(NGX_LOG_INFO, ev->log, err, |
| 4182 | 1085 "client prematurely closed connection, " |
| 479 | 1086 "so upstream connection is closed too"); |
| 1087 ngx_http_upstream_finalize_request(r, u, | |
| 1088 NGX_HTTP_CLIENT_CLOSED_REQUEST); | |
| 1089 return; | |
| 1090 } | |
| 1091 | |
| 1092 ngx_log_error(NGX_LOG_INFO, ev->log, err, | |
| 4182 | 1093 "client prematurely closed connection"); |
| 479 | 1094 |
| 1095 if (u->peer.connection == NULL) { | |
| 1096 ngx_http_upstream_finalize_request(r, u, | |
| 1097 NGX_HTTP_CLIENT_CLOSED_REQUEST); | |
| 1098 } | |
| 1099 } | |
| 1100 | |
| 1101 | |
| 487 | 1102 static void |
| 1103 ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u) | |
| 479 | 1104 { |
| 591 | 1105 ngx_int_t rc; |
| 665 | 1106 ngx_time_t *tp; |
| 591 | 1107 ngx_connection_t *c; |
| 479 | 1108 |
| 483 | 1109 r->connection->log->action = "connecting to upstream"; |
| 479 | 1110 |
| 1111 r->connection->single_connection = 0; | |
| 1112 | |
|
889
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
1113 if (u->state && u->state->response_sec) { |
| 665 | 1114 tp = ngx_timeofday(); |
|
889
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
1115 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
|
1116 u->state->response_msec = tp->msec - u->state->response_msec; |
| 665 | 1117 } |
| 1118 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
1119 u->state = ngx_array_push(r->upstream_states); |
| 665 | 1120 if (u->state == NULL) { |
| 1121 ngx_http_upstream_finalize_request(r, u, | |
| 1122 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1123 return; | |
| 1124 } | |
| 1125 | |
| 1126 ngx_memzero(u->state, sizeof(ngx_http_upstream_state_t)); | |
| 1127 | |
| 1128 tp = ngx_timeofday(); | |
|
889
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
1129 u->state->response_sec = tp->sec; |
|
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
1130 u->state->response_msec = tp->msec; |
| 665 | 1131 |
| 479 | 1132 rc = ngx_event_connect_peer(&u->peer); |
| 1133 | |
| 1134 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 1135 "http upstream connect: %i", rc); | |
| 1136 | |
| 1137 if (rc == NGX_ERROR) { | |
| 1138 ngx_http_upstream_finalize_request(r, u, | |
| 1139 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1140 return; | |
| 1141 } | |
| 1142 | |
|
1707
f3188f6eae1f
$upstream_addr did not contain last address, the bug was introduced in r1659
Igor Sysoev <igor@sysoev.ru>
parents:
1706
diff
changeset
|
1143 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
|
1144 |
| 543 | 1145 if (rc == NGX_BUSY) { |
| 1146 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "no live upstreams"); | |
| 1378 | 1147 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_NOLIVE); |
| 1148 return; | |
| 543 | 1149 } |
| 1150 | |
| 1378 | 1151 if (rc == NGX_DECLINED) { |
| 479 | 1152 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); |
| 1153 return; | |
| 1154 } | |
| 1155 | |
| 577 | 1156 /* rc == NGX_OK || rc == NGX_AGAIN */ |
| 1157 | |
| 479 | 1158 c = u->peer.connection; |
| 1159 | |
| 1160 c->data = r; | |
| 591 | 1161 |
|
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1162 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
|
1163 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
|
1164 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1165 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
|
1166 u->read_event_handler = ngx_http_upstream_process_header; |
| 479 | 1167 |
|
1397
6c25a49e548a
upstream sendfile bit was overridden by r->connection->sendfile
Igor Sysoev <igor@sysoev.ru>
parents:
1378
diff
changeset
|
1168 c->sendfile &= r->connection->sendfile; |
| 1958 | 1169 u->output.sendfile = c->sendfile; |
| 479 | 1170 |
|
4116
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1171 if (c->pool == NULL) { |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1172 |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1173 /* we need separate pool here to be able to cache SSL connections */ |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1174 |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1175 c->pool = ngx_create_pool(128, r->connection->log); |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1176 if (c->pool == NULL) { |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1177 ngx_http_upstream_finalize_request(r, u, |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1178 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1179 return; |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1180 } |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1181 } |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1182 |
| 2847 | 1183 c->log = r->connection->log; |
|
4116
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1184 c->pool->log = c->log; |
| 2847 | 1185 c->read->log = c->log; |
| 1186 c->write->log = c->log; | |
| 479 | 1187 |
| 1188 /* init or reinit the ngx_output_chain() and ngx_chain_writer() contexts */ | |
| 1189 | |
| 1190 u->writer.out = NULL; | |
| 1191 u->writer.last = &u->writer.out; | |
| 1192 u->writer.connection = c; | |
| 1193 u->writer.limit = 0; | |
| 1194 | |
| 1195 if (u->request_sent) { | |
| 509 | 1196 if (ngx_http_upstream_reinit(r, u) != NGX_OK) { |
| 1197 ngx_http_upstream_finalize_request(r, u, | |
| 1198 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1199 return; | |
| 1200 } | |
| 479 | 1201 } |
| 1202 | |
|
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
|
1203 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
|
1204 && 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
|
1205 && 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
|
1206 && 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
|
1207 { |
| 573 | 1208 /* |
| 1209 * the r->request_body->buf can be reused for one request only, | |
|
4572
67653855682e
Fixed spelling in multiline C comments.
Ruslan Ermilov <ru@nginx.com>
parents:
4546
diff
changeset
|
1210 * the subrequests should allocate their own temporary bufs |
| 573 | 1211 */ |
| 1212 | |
| 1213 u->output.free = ngx_alloc_chain_link(r->pool); | |
| 1214 if (u->output.free == NULL) { | |
| 1215 ngx_http_upstream_finalize_request(r, u, | |
| 1216 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1217 return; | |
| 479 | 1218 } |
| 573 | 1219 |
| 1220 u->output.free->buf = r->request_body->buf; | |
| 1221 u->output.free->next = NULL; | |
| 1222 u->output.allocated = 1; | |
| 1223 | |
| 1224 r->request_body->buf->pos = r->request_body->buf->start; | |
| 1225 r->request_body->buf->last = r->request_body->buf->start; | |
| 1226 r->request_body->buf->tag = u->output.tag; | |
| 479 | 1227 } |
| 1228 | |
| 1229 u->request_sent = 0; | |
| 1230 | |
| 1231 if (rc == NGX_AGAIN) { | |
| 1232 ngx_add_timer(c->write, u->conf->connect_timeout); | |
| 1233 return; | |
| 1234 } | |
| 1235 | |
| 577 | 1236 #if (NGX_HTTP_SSL) |
| 1237 | |
| 1658 | 1238 if (u->ssl && c->ssl == NULL) { |
| 591 | 1239 ngx_http_upstream_ssl_init_connection(r, u, c); |
| 577 | 1240 return; |
| 1241 } | |
| 1242 | |
| 1243 #endif | |
| 1244 | |
| 479 | 1245 ngx_http_upstream_send_request(r, u); |
| 1246 } | |
| 1247 | |
| 1248 | |
| 577 | 1249 #if (NGX_HTTP_SSL) |
| 1250 | |
| 1251 static void | |
| 591 | 1252 ngx_http_upstream_ssl_init_connection(ngx_http_request_t *r, |
| 1253 ngx_http_upstream_t *u, ngx_connection_t *c) | |
| 1254 { | |
| 884 | 1255 ngx_int_t rc; |
| 591 | 1256 |
| 1257 if (ngx_ssl_create_connection(u->conf->ssl, c, | |
| 1258 NGX_SSL_BUFFER|NGX_SSL_CLIENT) | |
|
2536
a6d6d762c554
small optimization: " == NGX_ERROR" > " != NGX_OK"
Igor Sysoev <igor@sysoev.ru>
parents:
2463
diff
changeset
|
1259 != NGX_OK) |
| 591 | 1260 { |
| 1261 ngx_http_upstream_finalize_request(r, u, | |
| 1262 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1263 return; | |
| 1264 } | |
| 1265 | |
| 1266 c->sendfile = 0; | |
| 619 | 1267 u->output.sendfile = 0; |
| 591 | 1268 |
| 2184 | 1269 if (u->conf->ssl_session_reuse) { |
| 1270 if (u->peer.set_session(&u->peer, u->peer.data) != NGX_OK) { | |
| 1271 ngx_http_upstream_finalize_request(r, u, | |
| 1272 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1273 return; | |
| 1274 } | |
| 591 | 1275 } |
| 1276 | |
| 641 | 1277 r->connection->log->action = "SSL handshaking to upstream"; |
| 1278 | |
| 591 | 1279 rc = ngx_ssl_handshake(c); |
| 1280 | |
| 1281 if (rc == NGX_AGAIN) { | |
| 1282 c->ssl->handler = ngx_http_upstream_ssl_handshake; | |
| 1283 return; | |
| 1284 } | |
| 1285 | |
| 1286 ngx_http_upstream_ssl_handshake(c); | |
| 1287 } | |
| 1288 | |
| 1289 | |
| 1290 static void | |
| 577 | 1291 ngx_http_upstream_ssl_handshake(ngx_connection_t *c) |
| 1292 { | |
| 1293 ngx_http_request_t *r; | |
| 1294 ngx_http_upstream_t *u; | |
| 1295 | |
| 1296 r = c->data; | |
| 1297 u = r->upstream; | |
| 1298 | |
| 1299 if (c->ssl->handshaked) { | |
| 1300 | |
| 2184 | 1301 if (u->conf->ssl_session_reuse) { |
| 1302 u->peer.save_session(&u->peer, u->peer.data); | |
| 1303 } | |
| 884 | 1304 |
|
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1305 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
|
1306 c->read->handler = ngx_http_upstream_handler; |
| 577 | 1307 |
| 1308 ngx_http_upstream_send_request(r, u); | |
| 1309 | |
| 1310 return; | |
| 1311 } | |
| 1312 | |
| 1313 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); | |
| 1314 | |
| 1315 } | |
| 1316 | |
| 1317 #endif | |
| 1318 | |
| 1319 | |
| 509 | 1320 static ngx_int_t |
| 487 | 1321 ngx_http_upstream_reinit(ngx_http_request_t *r, ngx_http_upstream_t *u) |
| 479 | 1322 { |
| 1323 ngx_chain_t *cl; | |
| 1324 | |
| 509 | 1325 if (u->reinit_request(r) != NGX_OK) { |
| 1326 return NGX_ERROR; | |
| 1327 } | |
| 1328 | |
|
4120
42135dd1f0ea
Upstream: keepalive flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4119
diff
changeset
|
1329 u->keepalive = 0; |
|
42135dd1f0ea
Upstream: keepalive flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4119
diff
changeset
|
1330 |
| 1705 | 1331 ngx_memzero(&u->headers_in, sizeof(ngx_http_upstream_headers_in_t)); |
|
4117
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
1332 u->headers_in.content_length_n = -1; |
| 1705 | 1333 |
| 1334 if (ngx_list_init(&u->headers_in.headers, r->pool, 8, | |
| 591 | 1335 sizeof(ngx_table_elt_t)) |
| 1336 != NGX_OK) | |
| 509 | 1337 { |
| 1338 return NGX_ERROR; | |
| 479 | 1339 } |
| 1340 | |
| 1341 /* reinit the request chain */ | |
| 577 | 1342 |
| 509 | 1343 for (cl = u->request_bufs; cl; cl = cl->next) { |
| 479 | 1344 cl->buf->pos = cl->buf->start; |
| 1345 cl->buf->file_pos = 0; | |
| 1346 } | |
| 1347 | |
| 509 | 1348 /* reinit the subrequest's ngx_output_chain() context */ |
| 1349 | |
| 573 | 1350 if (r->request_body && r->request_body->temp_file |
| 597 | 1351 && r != r->main && u->output.buf) |
| 573 | 1352 { |
| 1353 u->output.free = ngx_alloc_chain_link(r->pool); | |
| 1354 if (u->output.free == NULL) { | |
| 1355 return NGX_ERROR; | |
| 509 | 1356 } |
| 573 | 1357 |
| 1358 u->output.free->buf = u->output.buf; | |
| 1359 u->output.free->next = NULL; | |
| 1360 | |
| 1361 u->output.buf->pos = u->output.buf->start; | |
| 1362 u->output.buf->last = u->output.buf->start; | |
| 509 | 1363 } |
| 479 | 1364 |
| 1365 u->output.buf = NULL; | |
| 1366 u->output.in = NULL; | |
| 1367 u->output.busy = NULL; | |
| 577 | 1368 |
| 581 | 1369 /* reinit u->buffer */ |
| 577 | 1370 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1371 u->buffer.pos = u->buffer.start; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1372 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1373 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1374 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1375 if (r->cache) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1376 u->buffer.pos += r->cache->header_start; |
| 479 | 1377 } |
| 509 | 1378 |
| 479 | 1379 #endif |
| 1380 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1381 u->buffer.last = u->buffer.pos; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1382 |
| 509 | 1383 return NGX_OK; |
| 479 | 1384 } |
| 1385 | |
| 1386 | |
| 487 | 1387 static void |
| 1388 ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u) | |
| 479 | 1389 { |
|
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1390 ngx_int_t rc; |
| 483 | 1391 ngx_connection_t *c; |
| 577 | 1392 |
| 479 | 1393 c = u->peer.connection; |
| 1394 | |
| 1395 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, | |
| 1396 "http upstream send request"); | |
| 1397 | |
|
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1398 if (!u->request_sent && ngx_http_upstream_test_connect(c) != NGX_OK) { |
| 1166 | 1399 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
|
1400 return; |
| 479 | 1401 } |
| 1402 | |
| 483 | 1403 c->log->action = "sending request to upstream"; |
| 479 | 1404 |
| 509 | 1405 rc = ngx_output_chain(&u->output, u->request_sent ? NULL : u->request_bufs); |
| 479 | 1406 |
| 1407 u->request_sent = 1; | |
| 1408 | |
| 1409 if (rc == NGX_ERROR) { | |
| 1410 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); | |
| 1411 return; | |
| 1412 } | |
| 1413 | |
| 1414 if (c->write->timer_set) { | |
| 1415 ngx_del_timer(c->write); | |
| 1416 } | |
| 1417 | |
| 1418 if (rc == NGX_AGAIN) { | |
| 1419 ngx_add_timer(c->write, u->conf->send_timeout); | |
| 1420 | |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1421 if (ngx_handle_write_event(c->write, u->conf->send_lowat) != NGX_OK) { |
| 479 | 1422 ngx_http_upstream_finalize_request(r, u, |
| 1423 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1424 return; | |
| 1425 } | |
| 1426 | |
| 1427 return; | |
| 1428 } | |
| 1429 | |
| 1430 /* rc == NGX_OK */ | |
| 1431 | |
| 1432 if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) { | |
| 1433 if (ngx_tcp_push(c->fd) == NGX_ERROR) { | |
| 1434 ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno, | |
| 1435 ngx_tcp_push_n " failed"); | |
| 1436 ngx_http_upstream_finalize_request(r, u, | |
| 1437 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 577 | 1438 return; |
| 479 | 1439 } |
| 1440 | |
| 1441 c->tcp_nopush = NGX_TCP_NOPUSH_UNSET; | |
| 1442 } | |
| 577 | 1443 |
| 479 | 1444 ngx_add_timer(c->read, u->conf->read_timeout); |
| 1445 | |
| 1446 #if 1 | |
| 1447 if (c->read->ready) { | |
| 577 | 1448 |
| 479 | 1449 /* post aio operation */ |
| 1450 | |
| 1451 /* | |
| 1452 * TODO comment | |
| 1453 * although we can post aio operation just in the end | |
| 1454 * of ngx_http_upstream_connect() CHECK IT !!! | |
| 1455 * it's better to do here because we postpone header buffer allocation | |
| 1456 */ | |
| 1457 | |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1458 ngx_http_upstream_process_header(r, u); |
| 479 | 1459 return; |
| 1460 } | |
| 1461 #endif | |
| 1462 | |
|
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1463 u->write_event_handler = ngx_http_upstream_dummy_handler; |
| 479 | 1464 |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1465 if (ngx_handle_write_event(c->write, 0) != NGX_OK) { |
| 479 | 1466 ngx_http_upstream_finalize_request(r, u, |
| 1467 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1468 return; | |
| 1469 } | |
| 1470 } | |
| 1471 | |
| 1472 | |
| 487 | 1473 static void |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1474 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
|
1475 ngx_http_upstream_t *u) |
| 479 | 1476 { |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1477 ngx_connection_t *c; |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1478 |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1479 c = u->peer.connection; |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1480 |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1481 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 479 | 1482 "http upstream send request handler"); |
| 1483 | |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1484 if (c->write->timedout) { |
| 479 | 1485 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT); |
| 1486 return; | |
| 1487 } | |
| 1488 | |
| 591 | 1489 #if (NGX_HTTP_SSL) |
| 1490 | |
| 1658 | 1491 if (u->ssl && c->ssl == NULL) { |
| 591 | 1492 ngx_http_upstream_ssl_init_connection(r, u, c); |
| 1493 return; | |
| 1494 } | |
| 1495 | |
| 1496 #endif | |
| 1497 | |
| 651 | 1498 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
|
1499 u->write_event_handler = ngx_http_upstream_dummy_handler; |
| 651 | 1500 |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1501 (void) ngx_handle_write_event(c->write, 0); |
| 651 | 1502 |
| 1503 return; | |
| 1504 } | |
| 1505 | |
| 479 | 1506 ngx_http_upstream_send_request(r, u); |
| 1507 } | |
| 1508 | |
| 1509 | |
| 487 | 1510 static void |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1511 ngx_http_upstream_process_header(ngx_http_request_t *r, ngx_http_upstream_t *u) |
| 479 | 1512 { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1513 ssize_t n; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1514 ngx_int_t rc; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1515 ngx_connection_t *c; |
| 479 | 1516 |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1517 c = u->peer.connection; |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1518 |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1519 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, |
| 483 | 1520 "http upstream process header"); |
| 479 | 1521 |
| 483 | 1522 c->log->action = "reading response header from upstream"; |
| 479 | 1523 |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1524 if (c->read->timedout) { |
| 479 | 1525 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT); |
| 1526 return; | |
| 1527 } | |
| 577 | 1528 |
|
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1529 if (!u->request_sent && ngx_http_upstream_test_connect(c) != NGX_OK) { |
| 1166 | 1530 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
|
1531 return; |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1532 } |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1533 |
| 581 | 1534 if (u->buffer.start == NULL) { |
| 1535 u->buffer.start = ngx_palloc(r->pool, u->conf->buffer_size); | |
| 1536 if (u->buffer.start == NULL) { | |
| 479 | 1537 ngx_http_upstream_finalize_request(r, u, |
| 1538 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1539 return; | |
| 1540 } | |
| 1541 | |
| 581 | 1542 u->buffer.pos = u->buffer.start; |
| 1543 u->buffer.last = u->buffer.start; | |
| 1544 u->buffer.end = u->buffer.start + u->conf->buffer_size; | |
| 1545 u->buffer.temporary = 1; | |
| 1546 | |
| 1547 u->buffer.tag = u->output.tag; | |
| 479 | 1548 |
| 1705 | 1549 if (ngx_list_init(&u->headers_in.headers, r->pool, 8, |
| 581 | 1550 sizeof(ngx_table_elt_t)) |
| 1551 != NGX_OK) | |
| 509 | 1552 { |
| 1553 ngx_http_upstream_finalize_request(r, u, | |
| 1554 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1555 return; | |
| 1556 } | |
| 1557 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1558 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1559 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1560 if (r->cache) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1561 u->buffer.pos += r->cache->header_start; |
| 581 | 1562 u->buffer.last = u->buffer.pos; |
| 479 | 1563 } |
| 1564 #endif | |
| 1565 } | |
| 1566 | |
|
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1567 for ( ;; ) { |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1568 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1569 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
|
1570 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1571 if (n == NGX_AGAIN) { |
| 479 | 1572 #if 0 |
|
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1573 ngx_add_timer(rev, u->read_timeout); |
| 479 | 1574 #endif |
| 1575 | |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1576 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
|
1577 ngx_http_upstream_finalize_request(r, u, |
| 479 | 1578 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1579 return; |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1580 } |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1581 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1582 return; |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1583 } |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1584 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1585 if (n == 0) { |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1586 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
|
1587 "upstream prematurely closed connection"); |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1588 } |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1589 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1590 if (n == NGX_ERROR || n == 0) { |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1591 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); |
| 479 | 1592 return; |
| 1593 } | |
| 1594 | |
|
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1595 u->buffer.last += n; |
| 479 | 1596 |
| 1597 #if 0 | |
|
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1598 u->valid_header_in = 0; |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1599 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1600 u->peer.cached = 0; |
| 479 | 1601 #endif |
| 1602 | |
|
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1603 rc = u->process_header(r); |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1604 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1605 if (rc == NGX_AGAIN) { |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1606 |
|
4460
6299d1c4dbb4
Upstream: fixed "too big header" check.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
1607 if (u->buffer.last == u->buffer.end) { |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1608 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
|
1609 "upstream sent too big header"); |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1610 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1611 ngx_http_upstream_next(r, u, |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1612 NGX_HTTP_UPSTREAM_FT_INVALID_HEADER); |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1613 return; |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1614 } |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1615 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1616 continue; |
| 479 | 1617 } |
| 1618 | |
|
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
1619 break; |
| 479 | 1620 } |
| 1621 | |
| 1622 if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) { | |
| 1623 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_INVALID_HEADER); | |
| 1624 return; | |
| 1625 } | |
| 1626 | |
|
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
|
1627 if (rc == NGX_ERROR) { |
| 479 | 1628 ngx_http_upstream_finalize_request(r, u, |
| 1629 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1630 return; | |
| 1631 } | |
| 1632 | |
| 1633 /* rc == NGX_OK */ | |
| 1634 | |
|
3401
9e7926763f87
allow to handle 301/302 in error_page
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1635 if (u->headers_in.status_n > NGX_HTTP_SPECIAL_RESPONSE) { |
|
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1636 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1637 if (r->subrequest_in_memory) { |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1638 u->buffer.last = u->buffer.pos; |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1639 } |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1640 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1641 if (ngx_http_upstream_test_next(r, u) == NGX_OK) { |
| 509 | 1642 return; |
| 1643 } | |
| 1644 | |
|
2267
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1645 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
|
1646 return; |
| 487 | 1647 } |
| 1648 } | |
| 1649 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1650 if (ngx_http_upstream_process_headers(r, u) != NGX_OK) { |
| 515 | 1651 return; |
| 1652 } | |
| 1653 | |
|
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1654 if (!r->subrequest_in_memory) { |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1655 ngx_http_upstream_send_response(r, u); |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1656 return; |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1657 } |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1658 |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1659 /* subrequest content in memory */ |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1660 |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1661 if (u->input_filter == NULL) { |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1662 u->input_filter_init = ngx_http_upstream_non_buffered_filter_init; |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1663 u->input_filter = ngx_http_upstream_non_buffered_filter; |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1664 u->input_filter_ctx = r; |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1665 } |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1666 |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1667 if (u->input_filter_init(u->input_filter_ctx) == NGX_ERROR) { |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1668 ngx_http_upstream_finalize_request(r, u, |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1669 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1670 return; |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1671 } |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1672 |
|
2308
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1673 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
|
1674 |
|
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1675 if (n) { |
|
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1676 u->buffer.last -= n; |
|
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1677 |
| 2402 | 1678 u->state->response_length += n; |
| 1679 | |
|
2308
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1680 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
|
1681 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1682 return; |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1683 } |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1684 |
|
2308
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1685 if (u->length == 0) { |
|
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1686 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
|
1687 return; |
|
3f98400e31e9
memcached response was stored in variable with END
Igor Sysoev <igor@sysoev.ru>
parents:
2285
diff
changeset
|
1688 } |
|
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1689 } |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1690 |
|
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1691 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
|
1692 |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1693 ngx_http_upstream_process_body_in_memory(r, u); |
|
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1694 } |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1695 |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1696 |
|
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1697 static ngx_int_t |
|
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1698 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
|
1699 { |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1700 ngx_uint_t status; |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1701 ngx_http_upstream_next_t *un; |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1702 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1703 status = u->headers_in.status_n; |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1704 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1705 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
|
1706 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1707 if (status != un->status) { |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1708 continue; |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1709 } |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1710 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1711 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
|
1712 ngx_http_upstream_next(r, u, un->mask); |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1713 return NGX_OK; |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1714 } |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1715 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1716 #if (NGX_HTTP_CACHE) |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1717 |
| 2952 | 1718 if (u->cache_status == NGX_HTTP_CACHE_EXPIRED |
| 1719 && (u->conf->cache_use_stale & un->mask)) | |
| 1720 { | |
|
2824
d106509491b5
fix building --without-http-cache
Igor Sysoev <igor@sysoev.ru>
parents:
2807
diff
changeset
|
1721 ngx_int_t rc; |
|
2805
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
1722 |
|
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
1723 rc = u->reinit_request(r); |
|
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
1724 |
|
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
1725 if (rc == NGX_OK) { |
| 2952 | 1726 u->cache_status = NGX_HTTP_CACHE_STALE; |
|
2805
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
1727 rc = ngx_http_upstream_cache_send(r, u); |
|
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
1728 } |
|
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
1729 |
|
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
1730 ngx_http_upstream_finalize_request(r, u, rc); |
|
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1731 return NGX_OK; |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1732 } |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1733 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1734 #endif |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1735 } |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1736 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1737 return NGX_DECLINED; |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1738 } |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1739 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1740 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
1741 static ngx_int_t |
|
2267
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1742 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
|
1743 ngx_http_upstream_t *u) |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1744 { |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1745 ngx_int_t status; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1746 ngx_uint_t i; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1747 ngx_table_elt_t *h; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1748 ngx_http_err_page_t *err_page; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1749 ngx_http_core_loc_conf_t *clcf; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1750 |
|
2441
0c117a89f399
in miss case memcached module returned END instead of default 404 page body
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
1751 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
|
1752 |
|
0c117a89f399
in miss case memcached module returned END instead of default 404 page body
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
1753 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
|
1754 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
|
1755 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
|
1756 } |
|
0c117a89f399
in miss case memcached module returned END instead of default 404 page body
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
1757 |
|
2267
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1758 if (!u->conf->intercept_errors) { |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1759 return NGX_DECLINED; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1760 } |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1761 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1762 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
|
1763 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1764 if (clcf->error_pages == NULL) { |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1765 return NGX_DECLINED; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1766 } |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1767 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1768 err_page = clcf->error_pages->elts; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1769 for (i = 0; i < clcf->error_pages->nelts; i++) { |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1770 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1771 if (err_page[i].status == status) { |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1772 |
|
2953
aa12525236da
fix segfault if there is error_page 401, proxy_intercept_errors is on
Igor Sysoev <igor@sysoev.ru>
parents:
2952
diff
changeset
|
1773 if (status == NGX_HTTP_UNAUTHORIZED |
|
aa12525236da
fix segfault if there is error_page 401, proxy_intercept_errors is on
Igor Sysoev <igor@sysoev.ru>
parents:
2952
diff
changeset
|
1774 && u->headers_in.www_authenticate) |
|
aa12525236da
fix segfault if there is error_page 401, proxy_intercept_errors is on
Igor Sysoev <igor@sysoev.ru>
parents:
2952
diff
changeset
|
1775 { |
|
2267
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1776 h = ngx_list_push(&r->headers_out.headers); |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1777 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1778 if (h == NULL) { |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1779 ngx_http_upstream_finalize_request(r, u, |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1780 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1781 return NGX_OK; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1782 } |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1783 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1784 *h = *u->headers_in.www_authenticate; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1785 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1786 r->headers_out.www_authenticate = h; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1787 } |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1788 |
|
3706
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
1789 #if (NGX_HTTP_CACHE) |
|
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
1790 |
|
3709
64777690c697
fix r3707: cache node should be freed be a response is not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3708
diff
changeset
|
1791 if (r->cache) { |
|
3706
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
1792 time_t valid; |
|
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
1793 |
|
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
1794 valid = ngx_http_file_cache_valid(u->conf->cache_valid, status); |
|
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
1795 |
|
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
1796 if (valid) { |
|
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
1797 r->cache->valid_sec = ngx_time() + valid; |
|
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
1798 r->cache->error = status; |
|
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
1799 } |
|
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
1800 |
|
3711
ce6ba077c270
several changes in cache cleanup handling:
Igor Sysoev <igor@sysoev.ru>
parents:
3709
diff
changeset
|
1801 ngx_http_file_cache_free(r->cache, u->pipe->temp_file); |
|
3706
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
1802 } |
|
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
1803 #endif |
|
2267
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1804 ngx_http_upstream_finalize_request(r, u, status); |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1805 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1806 return NGX_OK; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1807 } |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1808 } |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1809 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1810 return NGX_DECLINED; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1811 } |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1812 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1813 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
1814 static ngx_int_t |
|
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1815 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
|
1816 { |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1817 int err; |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1818 socklen_t len; |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1819 |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1820 #if (NGX_HAVE_KQUEUE) |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1821 |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1822 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { |
|
4915
e62219793beb
Upstream: better detection of connect() failures with kqueue.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4895
diff
changeset
|
1823 if (c->write->pending_eof || c->read->pending_eof) { |
|
e62219793beb
Upstream: better detection of connect() failures with kqueue.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4895
diff
changeset
|
1824 if (c->write->pending_eof) { |
|
e62219793beb
Upstream: better detection of connect() failures with kqueue.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4895
diff
changeset
|
1825 err = c->write->kq_errno; |
|
e62219793beb
Upstream: better detection of connect() failures with kqueue.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4895
diff
changeset
|
1826 |
|
e62219793beb
Upstream: better detection of connect() failures with kqueue.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4895
diff
changeset
|
1827 } else { |
|
e62219793beb
Upstream: better detection of connect() failures with kqueue.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4895
diff
changeset
|
1828 err = c->read->kq_errno; |
|
e62219793beb
Upstream: better detection of connect() failures with kqueue.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4895
diff
changeset
|
1829 } |
|
e62219793beb
Upstream: better detection of connect() failures with kqueue.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4895
diff
changeset
|
1830 |
|
1469
0a269c464eaf
connection error should be logged with "connecting to upstream" action,
Igor Sysoev <igor@sysoev.ru>
parents:
1468
diff
changeset
|
1831 c->log->action = "connecting to upstream"; |
|
4916
79c8e87b1fcb
Trailing whitespace fix.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4915
diff
changeset
|
1832 (void) ngx_connection_error(c, err, |
| 1166 | 1833 "kevent() reported that connect() failed"); |
| 1834 return NGX_ERROR; | |
| 1835 } | |
|
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1836 |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1837 } else |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1838 #endif |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1839 { |
| 1166 | 1840 err = 0; |
| 1841 len = sizeof(int); | |
| 1842 | |
| 1843 /* | |
| 1844 * BSDs and Linux return 0 and set a pending error in err | |
| 1845 * Solaris returns -1 and sets errno | |
| 1846 */ | |
| 1847 | |
| 1848 if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, (void *) &err, &len) | |
| 1849 == -1) | |
| 1850 { | |
| 1851 err = ngx_errno; | |
| 1852 } | |
| 1853 | |
| 1854 if (err) { | |
|
1469
0a269c464eaf
connection error should be logged with "connecting to upstream" action,
Igor Sysoev <igor@sysoev.ru>
parents:
1468
diff
changeset
|
1855 c->log->action = "connecting to upstream"; |
| 1166 | 1856 (void) ngx_connection_error(c, err, "connect() failed"); |
| 1857 return NGX_ERROR; | |
| 1858 } | |
|
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1859 } |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1860 |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1861 return NGX_OK; |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1862 } |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1863 |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
1864 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1865 static ngx_int_t |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1866 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
|
1867 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1868 ngx_str_t *uri, args; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1869 ngx_uint_t i, flags; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1870 ngx_list_part_t *part; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1871 ngx_table_elt_t *h; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1872 ngx_http_upstream_header_t *hh; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1873 ngx_http_upstream_main_conf_t *umcf; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1874 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1875 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
|
1876 |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
1877 if (u->headers_in.x_accel_redirect |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
1878 && !(u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_XA_REDIRECT)) |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
1879 { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1880 ngx_http_upstream_finalize_request(r, u, NGX_DECLINED); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1881 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1882 part = &u->headers_in.headers.part; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1883 h = part->elts; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1884 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1885 for (i = 0; /* void */; i++) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1886 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1887 if (i >= part->nelts) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1888 if (part->next == NULL) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1889 break; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1890 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1891 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1892 part = part->next; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1893 h = part->elts; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1894 i = 0; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1895 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1896 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1897 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
|
1898 h[i].lowcase_key, h[i].key.len); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1899 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1900 if (hh && hh->redirect) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1901 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
|
1902 ngx_http_finalize_request(r, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1903 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1904 return NGX_DONE; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1905 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1906 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1907 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1908 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1909 uri = &u->headers_in.x_accel_redirect->value; |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3515
diff
changeset
|
1910 ngx_str_null(&args); |
| 3161 | 1911 flags = NGX_HTTP_LOG_UNSAFE; |
|
2592
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 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
|
1914 ngx_http_finalize_request(r, NGX_HTTP_NOT_FOUND); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1915 return NGX_DONE; |
|
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 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1918 if (r->method != NGX_HTTP_HEAD) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1919 r->method = NGX_HTTP_GET; |
|
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 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1922 ngx_http_internal_redirect(r, uri, &args); |
|
3120
40b8b398dbbc
fix request counter for X-Accel-Redirect, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3112
diff
changeset
|
1923 ngx_http_finalize_request(r, NGX_DONE); |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1924 return NGX_DONE; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1925 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1926 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1927 part = &u->headers_in.headers.part; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1928 h = part->elts; |
|
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 for (i = 0; /* void */; i++) { |
|
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 if (i >= part->nelts) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1933 if (part->next == NULL) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1934 break; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1935 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1936 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1937 part = part->next; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1938 h = part->elts; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1939 i = 0; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1940 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1941 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1942 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
|
1943 h[i].lowcase_key, h[i].key.len)) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1944 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1945 continue; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1946 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1947 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1948 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
|
1949 h[i].lowcase_key, h[i].key.len); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1950 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1951 if (hh) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1952 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
|
1953 ngx_http_upstream_finalize_request(r, u, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1954 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1955 return NGX_DONE; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1956 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1957 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1958 continue; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1959 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1960 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1961 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
|
1962 ngx_http_upstream_finalize_request(r, u, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1963 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1964 return NGX_DONE; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1965 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1966 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1967 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1968 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
|
1969 r->headers_out.server->hash = 0; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1970 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1971 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1972 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
|
1973 r->headers_out.date->hash = 0; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1974 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1975 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1976 r->headers_out.status = u->headers_in.status_n; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1977 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
|
1978 |
|
4117
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
1979 r->headers_out.content_length_n = u->headers_in.content_length_n; |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
1980 |
|
4118
dbddec65fdab
Upstream: r->upstream->length type change to off_t.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4117
diff
changeset
|
1981 u->length = u->headers_in.content_length_n; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1982 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1983 return NGX_OK; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1984 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1985 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1986 |
|
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1987 static void |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1988 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
|
1989 ngx_http_upstream_t *u) |
|
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1990 { |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1991 size_t size; |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1992 ssize_t n; |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1993 ngx_buf_t *b; |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1994 ngx_event_t *rev; |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1995 ngx_connection_t *c; |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1996 |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1997 c = u->peer.connection; |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1998 rev = c->read; |
|
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
1999 |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2000 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2001 "http upstream process body on memory"); |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2002 |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2003 if (rev->timedout) { |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2004 ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out"); |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2005 ngx_http_upstream_finalize_request(r, u, NGX_ETIMEDOUT); |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2006 return; |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2007 } |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2008 |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2009 b = &u->buffer; |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2010 |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2011 for ( ;; ) { |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2012 |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2013 size = b->end - b->last; |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2014 |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2015 if (size == 0) { |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2016 ngx_log_error(NGX_LOG_ALERT, c->log, 0, |
| 3708 | 2017 "upstream buffer is too small to read response"); |
|
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2018 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2019 return; |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2020 } |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2021 |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2022 n = c->recv(c, b->last, size); |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2023 |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2024 if (n == NGX_AGAIN) { |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2025 break; |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2026 } |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2027 |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2028 if (n == 0 || n == NGX_ERROR) { |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2029 ngx_http_upstream_finalize_request(r, u, n); |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2030 return; |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2031 } |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2032 |
| 2402 | 2033 u->state->response_length += n; |
| 2034 | |
|
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2035 if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) { |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2036 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2037 return; |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2038 } |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2039 |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2040 if (!rev->ready) { |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2041 break; |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2042 } |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2043 } |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2044 |
|
4120
42135dd1f0ea
Upstream: keepalive flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4119
diff
changeset
|
2045 if (u->length == 0) { |
|
42135dd1f0ea
Upstream: keepalive flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4119
diff
changeset
|
2046 ngx_http_upstream_finalize_request(r, u, 0); |
|
42135dd1f0ea
Upstream: keepalive flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4119
diff
changeset
|
2047 return; |
|
42135dd1f0ea
Upstream: keepalive flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4119
diff
changeset
|
2048 } |
|
42135dd1f0ea
Upstream: keepalive flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4119
diff
changeset
|
2049 |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2050 if (ngx_handle_read_event(rev, 0) != NGX_OK) { |
|
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2051 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2052 return; |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2053 } |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2054 |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2055 if (rev->active) { |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2056 ngx_add_timer(rev, u->conf->read_timeout); |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2057 |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2058 } else if (rev->timer_set) { |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2059 ngx_del_timer(rev); |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2060 } |
| 681 | 2061 } |
| 2062 | |
| 2063 | |
| 2064 static void | |
| 2065 ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u) | |
| 2066 { | |
| 2067 int tcp_nodelay; | |
| 2402 | 2068 ssize_t n; |
| 681 | 2069 ngx_int_t rc; |
| 2070 ngx_event_pipe_t *p; | |
| 2071 ngx_connection_t *c; | |
| 2072 ngx_http_core_loc_conf_t *clcf; | |
| 2073 | |
| 509 | 2074 rc = ngx_http_send_header(r); |
| 479 | 2075 |
| 2701 | 2076 if (rc == NGX_ERROR || rc > NGX_OK || r->post_action) { |
| 485 | 2077 ngx_http_upstream_finalize_request(r, u, rc); |
| 479 | 2078 return; |
| 2079 } | |
| 2080 | |
|
2704
ac1e2e199c9f
shutdown client connection for cacheable header only responses
Igor Sysoev <igor@sysoev.ru>
parents:
2703
diff
changeset
|
2081 c = r->connection; |
|
ac1e2e199c9f
shutdown client connection for cacheable header only responses
Igor Sysoev <igor@sysoev.ru>
parents:
2703
diff
changeset
|
2082 |
| 2701 | 2083 if (r->header_only) { |
|
2704
ac1e2e199c9f
shutdown client connection for cacheable header only responses
Igor Sysoev <igor@sysoev.ru>
parents:
2703
diff
changeset
|
2084 |
| 2701 | 2085 if (u->cacheable || u->store) { |
|
2704
ac1e2e199c9f
shutdown client connection for cacheable header only responses
Igor Sysoev <igor@sysoev.ru>
parents:
2703
diff
changeset
|
2086 |
|
ac1e2e199c9f
shutdown client connection for cacheable header only responses
Igor Sysoev <igor@sysoev.ru>
parents:
2703
diff
changeset
|
2087 if (ngx_shutdown_socket(c->fd, NGX_WRITE_SHUTDOWN) == -1) { |
|
ac1e2e199c9f
shutdown client connection for cacheable header only responses
Igor Sysoev <igor@sysoev.ru>
parents:
2703
diff
changeset
|
2088 ngx_connection_error(c, ngx_socket_errno, |
|
ac1e2e199c9f
shutdown client connection for cacheable header only responses
Igor Sysoev <igor@sysoev.ru>
parents:
2703
diff
changeset
|
2089 ngx_shutdown_socket_n " failed"); |
|
ac1e2e199c9f
shutdown client connection for cacheable header only responses
Igor Sysoev <igor@sysoev.ru>
parents:
2703
diff
changeset
|
2090 } |
|
ac1e2e199c9f
shutdown client connection for cacheable header only responses
Igor Sysoev <igor@sysoev.ru>
parents:
2703
diff
changeset
|
2091 |
| 2701 | 2092 r->read_event_handler = ngx_http_request_empty_handler; |
| 2093 r->write_event_handler = ngx_http_request_empty_handler; | |
|
2704
ac1e2e199c9f
shutdown client connection for cacheable header only responses
Igor Sysoev <igor@sysoev.ru>
parents:
2703
diff
changeset
|
2094 c->error = 1; |
| 2701 | 2095 |
| 2096 } else { | |
| 2097 ngx_http_upstream_finalize_request(r, u, rc); | |
| 2098 return; | |
| 2099 } | |
| 2100 } | |
| 2101 | |
| 479 | 2102 u->header_sent = 1; |
| 2103 | |
| 573 | 2104 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
|
2105 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
|
2106 r->request_body->temp_file->file.fd = NGX_INVALID_FILE; |
| 563 | 2107 } |
| 2108 | |
| 581 | 2109 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
| 2110 | |
| 649 | 2111 if (!u->buffering) { |
| 581 | 2112 |
| 2113 if (u->input_filter == NULL) { | |
| 2114 u->input_filter_init = ngx_http_upstream_non_buffered_filter_init; | |
| 2115 u->input_filter = ngx_http_upstream_non_buffered_filter; | |
| 2116 u->input_filter_ctx = r; | |
| 2117 } | |
| 2118 | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2119 u->read_event_handler = ngx_http_upstream_process_non_buffered_upstream; |
| 581 | 2120 r->write_event_handler = |
| 2121 ngx_http_upstream_process_non_buffered_downstream; | |
| 2122 | |
| 2123 r->limit_rate = 0; | |
| 2124 | |
| 2125 if (u->input_filter_init(u->input_filter_ctx) == NGX_ERROR) { | |
| 2126 ngx_http_upstream_finalize_request(r, u, 0); | |
| 2127 return; | |
| 2128 } | |
| 2129 | |
| 583 | 2130 if (clcf->tcp_nodelay && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) { |
| 2131 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay"); | |
| 2132 | |
| 2133 tcp_nodelay = 1; | |
| 2134 | |
| 2135 if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY, | |
| 2136 (const void *) &tcp_nodelay, sizeof(int)) == -1) | |
| 2137 { | |
| 2138 ngx_connection_error(c, ngx_socket_errno, | |
| 2139 "setsockopt(TCP_NODELAY) failed"); | |
| 2140 ngx_http_upstream_finalize_request(r, u, 0); | |
| 2141 return; | |
| 2142 } | |
| 2143 | |
| 2144 c->tcp_nodelay = NGX_TCP_NODELAY_SET; | |
| 2145 } | |
| 2146 | |
| 2402 | 2147 n = u->buffer.last - u->buffer.pos; |
| 2148 | |
| 2149 if (n) { | |
| 581 | 2150 u->buffer.last = u->buffer.pos; |
| 2151 | |
| 2402 | 2152 u->state->response_length += n; |
| 2153 | |
| 2154 if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) { | |
| 581 | 2155 ngx_http_upstream_finalize_request(r, u, 0); |
| 2156 return; | |
| 2157 } | |
| 2158 | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2159 ngx_http_upstream_process_non_buffered_downstream(r); |
| 581 | 2160 |
| 2161 } else { | |
| 2162 u->buffer.pos = u->buffer.start; | |
| 2163 u->buffer.last = u->buffer.start; | |
| 2164 | |
| 2165 if (ngx_http_send_special(r, NGX_HTTP_FLUSH) == NGX_ERROR) { | |
| 2166 ngx_http_upstream_finalize_request(r, u, 0); | |
| 2167 return; | |
| 2168 } | |
|
1468
491e5059ea19
read EOF of header only responses in non-buffered proxying
Igor Sysoev <igor@sysoev.ru>
parents:
1397
diff
changeset
|
2169 |
|
4120
42135dd1f0ea
Upstream: keepalive flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4119
diff
changeset
|
2170 if (u->peer.connection->read->ready || u->length == 0) { |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2171 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
|
2172 } |
| 581 | 2173 } |
| 2174 | |
| 2175 return; | |
| 2176 } | |
| 2177 | |
| 479 | 2178 /* TODO: preallocate event_pipe bufs, look "Content-Length" */ |
| 2179 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2180 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2181 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2182 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
|
2183 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
|
2184 r->cache->file.fd = NGX_INVALID_FILE; |
| 479 | 2185 } |
| 2186 | |
|
3699
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2187 switch (ngx_http_test_predicates(r, u->conf->no_cache)) { |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2188 |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2189 case NGX_ERROR: |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2190 ngx_http_upstream_finalize_request(r, u, 0); |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2191 return; |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2192 |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2193 case NGX_DECLINED: |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2194 u->cacheable = 0; |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2195 break; |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2196 |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2197 default: /* NGX_OK */ |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2198 |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2199 if (u->cache_status == NGX_HTTP_CACHE_BYPASS) { |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2200 |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2201 r->cache->min_uses = u->conf->cache_min_uses; |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2202 r->cache->body_start = u->conf->buffer_size; |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2203 r->cache->file_cache = u->conf->cache->data; |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2204 |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2205 if (ngx_http_file_cache_create(r) != NGX_OK) { |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2206 ngx_http_upstream_finalize_request(r, u, 0); |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2207 return; |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2208 } |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2209 } |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2210 |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2211 break; |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2212 } |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
2213 |
| 1565 | 2214 if (u->cacheable) { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2215 time_t now, valid; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2216 |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
2217 now = ngx_time(); |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
2218 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
2219 valid = r->cache->valid_sec; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
2220 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
2221 if (valid == 0) { |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
2222 valid = ngx_http_file_cache_valid(u->conf->cache_valid, |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
2223 u->headers_in.status_n); |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
2224 if (valid) { |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
2225 r->cache->valid_sec = now + valid; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
2226 } |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
2227 } |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
2228 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2229 if (valid) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2230 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
|
2231 r->cache->date = now; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2232 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
|
2233 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2234 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
|
2235 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2236 } else { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2237 u->cacheable = 0; |
|
2703
3b6afa999c2f
support 304 for cacheable responses
Igor Sysoev <igor@sysoev.ru>
parents:
2701
diff
changeset
|
2238 r->headers_out.last_modified_time = -1; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2239 } |
| 479 | 2240 } |
| 2241 | |
| 2690 | 2242 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, |
| 2243 "http cacheable: %d", u->cacheable); | |
| 2244 | |
|
3083
ffe8bfb38184
clean cache updating state if a response has uncacheable code or
Igor Sysoev <igor@sysoev.ru>
parents:
3056
diff
changeset
|
2245 if (u->cacheable == 0 && r->cache) { |
|
3711
ce6ba077c270
several changes in cache cleanup handling:
Igor Sysoev <igor@sysoev.ru>
parents:
3709
diff
changeset
|
2246 ngx_http_file_cache_free(r->cache, u->pipe->temp_file); |
|
3083
ffe8bfb38184
clean cache updating state if a response has uncacheable code or
Igor Sysoev <igor@sysoev.ru>
parents:
3056
diff
changeset
|
2247 } |
|
ffe8bfb38184
clean cache updating state if a response has uncacheable code or
Igor Sysoev <igor@sysoev.ru>
parents:
3056
diff
changeset
|
2248 |
| 479 | 2249 #endif |
| 2250 | |
| 581 | 2251 p = u->pipe; |
| 479 | 2252 |
| 2253 p->output_filter = (ngx_event_pipe_output_filter_pt) ngx_http_output_filter; | |
| 2254 p->output_ctx = r; | |
| 2255 p->tag = u->output.tag; | |
| 577 | 2256 p->bufs = u->conf->bufs; |
| 479 | 2257 p->busy_size = u->conf->busy_buffers_size; |
| 2258 p->upstream = u->peer.connection; | |
| 583 | 2259 p->downstream = c; |
| 479 | 2260 p->pool = r->pool; |
| 583 | 2261 p->log = c->log; |
| 577 | 2262 |
| 1565 | 2263 p->cacheable = u->cacheable || u->store; |
| 479 | 2264 |
| 501 | 2265 p->temp_file = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t)); |
| 2266 if (p->temp_file == NULL) { | |
| 479 | 2267 ngx_http_upstream_finalize_request(r, u, 0); |
| 2268 return; | |
| 2269 } | |
| 2270 | |
| 2271 p->temp_file->file.fd = NGX_INVALID_FILE; | |
| 583 | 2272 p->temp_file->file.log = c->log; |
| 479 | 2273 p->temp_file->path = u->conf->temp_path; |
| 2274 p->temp_file->pool = r->pool; | |
| 577 | 2275 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2276 if (p->cacheable) { |
| 479 | 2277 p->temp_file->persistent = 1; |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2278 |
| 479 | 2279 } else { |
| 667 | 2280 p->temp_file->log_level = NGX_LOG_WARN; |
| 479 | 2281 p->temp_file->warn = "an upstream response is buffered " |
| 2282 "to a temporary file"; | |
| 2283 } | |
| 2284 | |
| 2285 p->max_temp_file_size = u->conf->max_temp_file_size; | |
| 2286 p->temp_file_write_size = u->conf->temp_file_write_size; | |
| 2287 | |
| 501 | 2288 p->preread_bufs = ngx_alloc_chain_link(r->pool); |
| 2289 if (p->preread_bufs == NULL) { | |
| 479 | 2290 ngx_http_upstream_finalize_request(r, u, 0); |
| 2291 return; | |
| 2292 } | |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2293 |
| 581 | 2294 p->preread_bufs->buf = &u->buffer; |
| 479 | 2295 p->preread_bufs->next = NULL; |
| 581 | 2296 u->buffer.recycled = 1; |
| 2297 | |
| 2298 p->preread_size = u->buffer.last - u->buffer.pos; | |
| 479 | 2299 |
| 1565 | 2300 if (u->cacheable) { |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2301 |
| 479 | 2302 p->buf_to_file = ngx_calloc_buf(r->pool); |
| 2303 if (p->buf_to_file == NULL) { | |
| 2304 ngx_http_upstream_finalize_request(r, u, 0); | |
| 2305 return; | |
| 2306 } | |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2307 |
|
4895
508e61393b6c
Event pipe: fixed handling of buf_to_file data.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4769
diff
changeset
|
2308 p->buf_to_file->start = u->buffer.start; |
| 581 | 2309 p->buf_to_file->pos = u->buffer.start; |
| 2310 p->buf_to_file->last = u->buffer.pos; | |
| 479 | 2311 p->buf_to_file->temporary = 1; |
| 2312 } | |
| 2313 | |
| 2314 if (ngx_event_flags & NGX_USE_AIO_EVENT) { | |
|
4499
778ef9c3fd2d
Fixed spelling in single-line comments.
Ruslan Ermilov <ru@nginx.com>
parents:
4474
diff
changeset
|
2315 /* the posted aio operation may corrupt a shadow buffer */ |
| 479 | 2316 p->single_buf = 1; |
| 2317 } | |
| 2318 | |
| 2319 /* TODO: p->free_bufs = 0 if use ngx_create_chain_of_bufs() */ | |
| 2320 p->free_bufs = 1; | |
| 2321 | |
| 2322 /* | |
| 581 | 2323 * event_pipe would do u->buffer.last += p->preread_size |
| 479 | 2324 * as though these bytes were read |
| 2325 */ | |
| 581 | 2326 u->buffer.last = u->buffer.pos; |
| 479 | 2327 |
| 2328 if (u->conf->cyclic_temp_file) { | |
| 2329 | |
| 2330 /* | |
| 2331 * we need to disable the use of sendfile() if we use cyclic temp file | |
| 2332 * because the writing a new data may interfere with sendfile() | |
| 2333 * that uses the same kernel file pages (at least on FreeBSD) | |
| 2334 */ | |
| 2335 | |
| 2336 p->cyclic_temp_file = 1; | |
| 583 | 2337 c->sendfile = 0; |
| 479 | 2338 |
| 2339 } else { | |
| 2340 p->cyclic_temp_file = 0; | |
| 2341 } | |
| 2342 | |
| 2343 p->read_timeout = u->conf->read_timeout; | |
| 2344 p->send_timeout = clcf->send_timeout; | |
| 2345 p->send_lowat = clcf->send_lowat; | |
| 2346 | |
|
4119
b66712cde67d
Upstream: pipe length and input_filter_init in buffered mode.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4118
diff
changeset
|
2347 p->length = -1; |
|
b66712cde67d
Upstream: pipe length and input_filter_init in buffered mode.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4118
diff
changeset
|
2348 |
|
b66712cde67d
Upstream: pipe length and input_filter_init in buffered mode.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4118
diff
changeset
|
2349 if (u->input_filter_init |
|
b66712cde67d
Upstream: pipe length and input_filter_init in buffered mode.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4118
diff
changeset
|
2350 && u->input_filter_init(p->input_ctx) != NGX_OK) |
|
b66712cde67d
Upstream: pipe length and input_filter_init in buffered mode.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4118
diff
changeset
|
2351 { |
|
b66712cde67d
Upstream: pipe length and input_filter_init in buffered mode.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4118
diff
changeset
|
2352 ngx_http_upstream_finalize_request(r, u, 0); |
|
b66712cde67d
Upstream: pipe length and input_filter_init in buffered mode.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4118
diff
changeset
|
2353 return; |
|
b66712cde67d
Upstream: pipe length and input_filter_init in buffered mode.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4118
diff
changeset
|
2354 } |
|
b66712cde67d
Upstream: pipe length and input_filter_init in buffered mode.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4118
diff
changeset
|
2355 |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2356 u->read_event_handler = ngx_http_upstream_process_upstream; |
| 509 | 2357 r->write_event_handler = ngx_http_upstream_process_downstream; |
| 479 | 2358 |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2359 ngx_http_upstream_process_upstream(r, u); |
| 479 | 2360 } |
| 2361 | |
| 2362 | |
| 487 | 2363 static void |
| 581 | 2364 ngx_http_upstream_process_non_buffered_downstream(ngx_http_request_t *r) |
| 2365 { | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2366 ngx_event_t *wev; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2367 ngx_connection_t *c; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2368 ngx_http_upstream_t *u; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2369 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2370 c = r->connection; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2371 u = r->upstream; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2372 wev = c->write; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2373 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2374 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
|
2375 "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
|
2376 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2377 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
|
2378 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2379 if (wev->timedout) { |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2380 c->timedout = 1; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2381 ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out"); |
|
3963
10fbb8f02a45
finalizing with rc == 0 in unbuffered proxy mode caused nginx to wait
Igor Sysoev <igor@sysoev.ru>
parents:
3944
diff
changeset
|
2382 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_REQUEST_TIME_OUT); |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2383 return; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2384 } |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2385 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2386 ngx_http_upstream_process_non_buffered_request(r, 1); |
| 581 | 2387 } |
| 2388 | |
| 2389 | |
| 2390 static void | |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2391 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
|
2392 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
|
2393 { |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2394 ngx_connection_t *c; |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2395 |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2396 c = u->peer.connection; |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2397 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2398 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
|
2399 "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
|
2400 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2401 c->log->action = "reading upstream"; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2402 |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2403 if (c->read->timedout) { |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2404 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
|
2405 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
|
2406 return; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2407 } |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2408 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2409 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
|
2410 } |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2411 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2412 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2413 static void |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2414 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
|
2415 ngx_uint_t do_write) |
| 581 | 2416 { |
| 2417 size_t size; | |
| 2418 ssize_t n; | |
| 2419 ngx_buf_t *b; | |
| 583 | 2420 ngx_int_t rc; |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2421 ngx_connection_t *downstream, *upstream; |
| 581 | 2422 ngx_http_upstream_t *u; |
| 2423 ngx_http_core_loc_conf_t *clcf; | |
| 2424 | |
|
756
d904b5cb3bba
fix building introduced by previous commit
Igor Sysoev <igor@sysoev.ru>
parents:
755
diff
changeset
|
2425 u = r->upstream; |
| 884 | 2426 downstream = r->connection; |
| 2427 upstream = u->peer.connection; | |
| 581 | 2428 |
| 2429 b = &u->buffer; | |
| 2430 | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2431 do_write = do_write || u->length == 0; |
| 581 | 2432 |
| 2433 for ( ;; ) { | |
| 2434 | |
| 2435 if (do_write) { | |
| 2436 | |
| 2437 if (u->out_bufs || u->busy_bufs) { | |
| 583 | 2438 rc = ngx_http_output_filter(r, u->out_bufs); |
| 2439 | |
| 2440 if (rc == NGX_ERROR) { | |
| 581 | 2441 ngx_http_upstream_finalize_request(r, u, 0); |
| 2442 return; | |
| 2443 } | |
| 2444 | |
|
4114
5db098f97e0e
API change: ngx_chain_update_chains() now requires pool.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
2445 ngx_chain_update_chains(r->pool, &u->free_bufs, &u->busy_bufs, |
| 581 | 2446 &u->out_bufs, u->output.tag); |
| 2447 } | |
| 2448 | |
| 2449 if (u->busy_bufs == NULL) { | |
| 2450 | |
| 2451 if (u->length == 0 | |
| 884 | 2452 || upstream->read->eof |
| 2453 || upstream->read->error) | |
| 581 | 2454 { |
| 2455 ngx_http_upstream_finalize_request(r, u, 0); | |
| 2456 return; | |
| 2457 } | |
| 2458 | |
| 2459 b->pos = b->start; | |
| 2460 b->last = b->start; | |
| 2461 } | |
| 2462 } | |
| 2463 | |
| 2464 size = b->end - b->last; | |
| 2465 | |
| 884 | 2466 if (size && upstream->read->ready) { |
| 2467 | |
| 2468 n = upstream->recv(upstream, b->last, size); | |
| 581 | 2469 |
| 2470 if (n == NGX_AGAIN) { | |
| 2471 break; | |
| 2472 } | |
| 2473 | |
| 2474 if (n > 0) { | |
| 2402 | 2475 u->state->response_length += n; |
| 2476 | |
| 581 | 2477 if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) { |
| 2478 ngx_http_upstream_finalize_request(r, u, 0); | |
| 2479 return; | |
| 2480 } | |
| 2481 } | |
| 2482 | |
| 2483 do_write = 1; | |
| 2484 | |
| 2485 continue; | |
| 2486 } | |
| 2487 | |
| 2488 break; | |
| 2489 } | |
| 2490 | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2491 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
|
2492 |
| 884 | 2493 if (downstream->data == r) { |
| 2494 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
|
2495 != NGX_OK) |
| 583 | 2496 { |
| 2497 ngx_http_upstream_finalize_request(r, u, 0); | |
| 2498 return; | |
| 2499 } | |
| 581 | 2500 } |
| 2501 | |
|
1063
e2a6ecc5a3ae
a non-active client connection must not closed after send timeout
Igor Sysoev <igor@sysoev.ru>
parents:
1031
diff
changeset
|
2502 if (downstream->write->active && !downstream->write->ready) { |
| 884 | 2503 ngx_add_timer(downstream->write, clcf->send_timeout); |
| 2504 | |
| 2505 } else if (downstream->write->timer_set) { | |
| 2506 ngx_del_timer(downstream->write); | |
| 581 | 2507 } |
| 2508 | |
|
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
2509 if (ngx_handle_read_event(upstream->read, 0) != NGX_OK) { |
| 581 | 2510 ngx_http_upstream_finalize_request(r, u, 0); |
| 2511 return; | |
| 2512 } | |
| 2513 | |
|
1063
e2a6ecc5a3ae
a non-active client connection must not closed after send timeout
Igor Sysoev <igor@sysoev.ru>
parents:
1031
diff
changeset
|
2514 if (upstream->read->active && !upstream->read->ready) { |
| 884 | 2515 ngx_add_timer(upstream->read, u->conf->read_timeout); |
| 2516 | |
| 2517 } else if (upstream->read->timer_set) { | |
| 2518 ngx_del_timer(upstream->read); | |
| 581 | 2519 } |
| 2520 } | |
| 2521 | |
| 2522 | |
| 2523 static ngx_int_t | |
| 2524 ngx_http_upstream_non_buffered_filter_init(void *data) | |
| 2525 { | |
| 2526 return NGX_OK; | |
| 2527 } | |
| 2528 | |
| 2529 | |
| 2530 static ngx_int_t | |
| 2531 ngx_http_upstream_non_buffered_filter(void *data, ssize_t bytes) | |
| 2532 { | |
| 2533 ngx_http_request_t *r = data; | |
| 2534 | |
| 2535 ngx_buf_t *b; | |
| 2536 ngx_chain_t *cl, **ll; | |
| 2537 ngx_http_upstream_t *u; | |
| 2538 | |
| 2539 u = r->upstream; | |
| 2540 | |
| 2541 for (cl = u->out_bufs, ll = &u->out_bufs; cl; cl = cl->next) { | |
| 2542 ll = &cl->next; | |
| 2543 } | |
| 2544 | |
| 2545 cl = ngx_chain_get_free_buf(r->pool, &u->free_bufs); | |
| 2546 if (cl == NULL) { | |
| 2547 return NGX_ERROR; | |
| 2548 } | |
| 2549 | |
| 2550 *ll = cl; | |
| 2551 | |
| 2552 cl->buf->flush = 1; | |
| 2553 cl->buf->memory = 1; | |
| 2554 | |
| 2555 b = &u->buffer; | |
| 2556 | |
| 2557 cl->buf->pos = b->last; | |
| 2558 b->last += bytes; | |
| 2559 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
|
2560 cl->buf->tag = u->output.tag; |
| 581 | 2561 |
|
4118
dbddec65fdab
Upstream: r->upstream->length type change to off_t.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4117
diff
changeset
|
2562 if (u->length == -1) { |
| 581 | 2563 return NGX_OK; |
| 2564 } | |
| 2565 | |
| 2566 u->length -= bytes; | |
| 2567 | |
| 2568 return NGX_OK; | |
| 2569 } | |
| 2570 | |
| 2571 | |
| 2572 static void | |
| 509 | 2573 ngx_http_upstream_process_downstream(ngx_http_request_t *r) |
| 2574 { | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2575 ngx_event_t *wev; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2576 ngx_connection_t *c; |
| 509 | 2577 ngx_event_pipe_t *p; |
| 479 | 2578 ngx_http_upstream_t *u; |
| 2579 | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2580 c = r->connection; |
| 479 | 2581 u = r->upstream; |
| 581 | 2582 p = u->pipe; |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2583 wev = c->write; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2584 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2585 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
|
2586 "http upstream process downstream"); |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2587 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2588 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
|
2589 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2590 if (wev->timedout) { |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2591 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2592 if (wev->delayed) { |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2593 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2594 wev->timedout = 0; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2595 wev->delayed = 0; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2596 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2597 if (!wev->ready) { |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2598 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
|
2599 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2600 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
|
2601 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
|
2602 } |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2603 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2604 return; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2605 } |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2606 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2607 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
|
2608 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
|
2609 return; |
| 527 | 2610 } |
| 479 | 2611 |
| 2612 } else { | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2613 p->downstream_error = 1; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2614 c->timedout = 1; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2615 ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out"); |
| 479 | 2616 } |
| 2617 | |
| 2618 } else { | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2619 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2620 if (wev->delayed) { |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2621 |
| 527 | 2622 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, |
| 2623 "http downstream delayed"); | |
| 2624 | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2625 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
|
2626 ngx_http_upstream_finalize_request(r, u, 0); |
| 527 | 2627 } |
| 2628 | |
| 2629 return; | |
| 2630 } | |
| 2631 | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2632 if (ngx_event_pipe(p, 1) == NGX_ABORT) { |
| 479 | 2633 ngx_http_upstream_finalize_request(r, u, 0); |
| 2634 return; | |
| 2635 } | |
| 2636 } | |
| 577 | 2637 |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2638 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
|
2639 } |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2640 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2641 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2642 static void |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2643 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
|
2644 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
|
2645 { |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2646 ngx_connection_t *c; |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2647 |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2648 c = u->peer.connection; |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2649 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2650 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
|
2651 "http upstream process upstream"); |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2652 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2653 c->log->action = "reading upstream"; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2654 |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2655 if (c->read->timedout) { |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2656 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
|
2657 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
|
2658 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2659 } else { |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2660 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
|
2661 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
|
2662 return; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2663 } |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2664 } |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2665 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2666 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
|
2667 } |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2668 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2669 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2670 static void |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2671 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
|
2672 { |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2673 ngx_temp_file_t *tf; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2674 ngx_event_pipe_t *p; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2675 ngx_http_upstream_t *u; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2676 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2677 u = r->upstream; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2678 p = u->pipe; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2679 |
| 479 | 2680 if (u->peer.connection) { |
| 2681 | |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2682 if (u->store) { |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2683 |
| 2463 | 2684 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
|
2685 |
|
4469
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
2686 tf = u->pipe->temp_file; |
|
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
2687 |
|
2445
3c6af1fb7586
proxy/fastcgi_store did not delete incomplete files
Igor Sysoev <igor@sysoev.ru>
parents:
2441
diff
changeset
|
2688 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
|
2689 && (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
|
2690 || (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
|
2691 { |
|
3c6af1fb7586
proxy/fastcgi_store did not delete incomplete files
Igor Sysoev <igor@sysoev.ru>
parents:
2441
diff
changeset
|
2692 ngx_http_upstream_store(r, u); |
|
4469
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
2693 u->store = 0; |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2694 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2695 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2696 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2697 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2698 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2699 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2700 if (u->cacheable) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2701 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2702 if (p->upstream_done) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2703 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
|
2704 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2705 } else if (p->upstream_eof) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2706 |
|
4298
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
2707 tf = u->pipe->temp_file; |
|
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
2708 |
|
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
2709 if (u->headers_in.content_length_n == -1 |
|
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
2710 || u->headers_in.content_length_n |
|
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
2711 == tf->offset - (off_t) r->cache->body_start) |
|
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
2712 { |
|
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
2713 ngx_http_file_cache_update(r, tf); |
|
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
2714 |
|
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
2715 } else { |
|
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
2716 ngx_http_file_cache_free(r->cache, tf); |
|
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
2717 } |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2718 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2719 } else if (p->upstream_error) { |
|
3711
ce6ba077c270
several changes in cache cleanup handling:
Igor Sysoev <igor@sysoev.ru>
parents:
3709
diff
changeset
|
2720 ngx_http_file_cache_free(r->cache, u->pipe->temp_file); |
| 479 | 2721 } |
| 2722 } | |
| 2723 | |
| 2724 #endif | |
| 2725 | |
| 2726 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
|
2727 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 483 | 2728 "http upstream exit: %p", p->out); |
| 479 | 2729 #if 0 |
| 2730 ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock); | |
| 2731 #endif | |
| 2732 ngx_http_upstream_finalize_request(r, u, 0); | |
| 2733 return; | |
| 2734 } | |
| 2735 } | |
| 2736 | |
| 2737 if (p->downstream_error) { | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
2738 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 483 | 2739 "http upstream downstream error"); |
| 479 | 2740 |
|
2757
9cc973b46af1
get a full response if the response is cacheable or storable even
Igor Sysoev <igor@sysoev.ru>
parents:
2708
diff
changeset
|
2741 if (!u->cacheable && !u->store && u->peer.connection) { |
| 479 | 2742 ngx_http_upstream_finalize_request(r, u, 0); |
| 2743 } | |
| 2744 } | |
| 2745 } | |
| 2746 | |
| 2747 | |
| 487 | 2748 static void |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2749 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
|
2750 { |
|
1947
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2751 size_t root; |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2752 time_t lm; |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2753 ngx_str_t path; |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2754 ngx_temp_file_t *tf; |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2755 ngx_ext_rename_file_t ext; |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2756 |
| 1777 | 2757 tf = u->pipe->temp_file; |
| 2758 | |
| 2759 if (tf->file.fd == NGX_INVALID_FILE) { | |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2760 |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2761 /* create file for empty 200 response */ |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2762 |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2763 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
|
2764 if (tf == NULL) { |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2765 return; |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2766 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2767 |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2768 tf->file.fd = NGX_INVALID_FILE; |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2769 tf->file.log = r->connection->log; |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2770 tf->path = u->conf->temp_path; |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2771 tf->pool = r->pool; |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2772 tf->persistent = 1; |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2773 |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2774 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
|
2775 tf->persistent, tf->clean, tf->access) |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2776 != NGX_OK) |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2777 { |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2778 return; |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2779 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2780 |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2781 u->pipe->temp_file = tf; |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2782 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2783 |
|
1947
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2784 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
|
2785 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
|
2786 ext.time = -1; |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2787 ext.create_path = 1; |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2788 ext.delete_file = 1; |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2789 ext.log = r->connection->log; |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2790 |
| 1705 | 2791 if (u->headers_in.last_modified) { |
| 2792 | |
|
1947
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2793 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
|
2794 u->headers_in.last_modified->value.len); |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2795 |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2796 if (lm != NGX_ERROR) { |
|
1947
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2797 ext.time = lm; |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2798 ext.fd = tf->file.fd; |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2799 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2800 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2801 |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2802 if (u->conf->store_lengths == NULL) { |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2803 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2804 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
|
2805 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2806 } else { |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2807 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
|
2808 u->conf->store_values->elts) |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2809 == NULL) |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2810 { |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2811 return; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2812 } |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2813 } |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2814 |
|
3032
524ba56ba9f7
fix copy destination name length, introduced in r3025
Igor Sysoev <igor@sysoev.ru>
parents:
3024
diff
changeset
|
2815 path.len--; |
|
524ba56ba9f7
fix copy destination name length, introduced in r3025
Igor Sysoev <igor@sysoev.ru>
parents:
3024
diff
changeset
|
2816 |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2817 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
|
2818 "upstream stores \"%s\" to \"%s\"", |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2819 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
|
2820 |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
2821 (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
|
2822 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2823 |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2824 |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
2825 static void |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2826 ngx_http_upstream_dummy_handler(ngx_http_request_t *r, ngx_http_upstream_t *u) |
| 479 | 2827 { |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2828 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 479 | 2829 "http upstream dummy handler"); |
| 2830 } | |
| 2831 | |
| 2832 | |
| 487 | 2833 static void |
| 2834 ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u, | |
| 2835 ngx_uint_t ft_type) | |
| 479 | 2836 { |
| 884 | 2837 ngx_uint_t status, state; |
| 479 | 2838 |
| 2839 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 884 | 2840 "http next upstream, %xi", ft_type); |
| 479 | 2841 |
| 2842 #if 0 | |
| 2843 ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock); | |
| 2844 #endif | |
| 2845 | |
| 525 | 2846 if (ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_404) { |
| 884 | 2847 state = NGX_PEER_NEXT; |
| 525 | 2848 } else { |
| 884 | 2849 state = NGX_PEER_FAILED; |
| 479 | 2850 } |
| 525 | 2851 |
| 1378 | 2852 if (ft_type != NGX_HTTP_UPSTREAM_FT_NOLIVE) { |
| 2853 u->peer.free(&u->peer, u->peer.data, state); | |
| 2854 } | |
| 525 | 2855 |
| 479 | 2856 if (ft_type == NGX_HTTP_UPSTREAM_FT_TIMEOUT) { |
| 2857 ngx_log_error(NGX_LOG_ERR, r->connection->log, NGX_ETIMEDOUT, | |
| 2858 "upstream timed out"); | |
| 2859 } | |
| 577 | 2860 |
| 479 | 2861 if (u->peer.cached && ft_type == NGX_HTTP_UPSTREAM_FT_ERROR) { |
| 2862 status = 0; | |
| 2863 | |
|
4115
70a45a504905
Workaround for cpu hog on errors with cached connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4114
diff
changeset
|
2864 /* TODO: inform balancer instead */ |
|
70a45a504905
Workaround for cpu hog on errors with cached connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4114
diff
changeset
|
2865 |
|
70a45a504905
Workaround for cpu hog on errors with cached connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4114
diff
changeset
|
2866 u->peer.tries++; |
|
70a45a504905
Workaround for cpu hog on errors with cached connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4114
diff
changeset
|
2867 |
| 479 | 2868 } else { |
| 2869 switch(ft_type) { | |
| 2870 | |
| 2871 case NGX_HTTP_UPSTREAM_FT_TIMEOUT: | |
| 2872 status = NGX_HTTP_GATEWAY_TIME_OUT; | |
| 2873 break; | |
| 2874 | |
| 2875 case NGX_HTTP_UPSTREAM_FT_HTTP_500: | |
| 2876 status = NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 2877 break; | |
| 2878 | |
| 2879 case NGX_HTTP_UPSTREAM_FT_HTTP_404: | |
| 2880 status = NGX_HTTP_NOT_FOUND; | |
| 2881 break; | |
| 2882 | |
| 2883 /* | |
| 2884 * NGX_HTTP_UPSTREAM_FT_BUSY_LOCK and NGX_HTTP_UPSTREAM_FT_MAX_WAITING | |
| 2885 * never reach here | |
| 2886 */ | |
| 2887 | |
| 2888 default: | |
| 2889 status = NGX_HTTP_BAD_GATEWAY; | |
| 2890 } | |
| 2891 } | |
| 2892 | |
| 583 | 2893 if (r->connection->error) { |
| 479 | 2894 ngx_http_upstream_finalize_request(r, u, |
| 2895 NGX_HTTP_CLIENT_CLOSED_REQUEST); | |
| 2896 return; | |
| 2897 } | |
| 2898 | |
| 2899 if (status) { | |
| 2900 u->state->status = status; | |
| 2901 | |
| 525 | 2902 if (u->peer.tries == 0 || !(u->conf->next_upstream & ft_type)) { |
| 479 | 2903 |
| 2904 #if (NGX_HTTP_CACHE) | |
| 2905 | |
| 2952 | 2906 if (u->cache_status == NGX_HTTP_CACHE_EXPIRED |
| 2907 && (u->conf->cache_use_stale & ft_type)) | |
| 2908 { | |
|
2805
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
2909 ngx_int_t rc; |
|
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
2910 |
|
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
2911 rc = u->reinit_request(r); |
|
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
2912 |
|
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
2913 if (rc == NGX_OK) { |
| 2952 | 2914 u->cache_status = NGX_HTTP_CACHE_STALE; |
|
2805
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
2915 rc = ngx_http_upstream_cache_send(r, u); |
|
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
2916 } |
|
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
2917 |
|
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
2918 ngx_http_upstream_finalize_request(r, u, rc); |
| 479 | 2919 return; |
| 2920 } | |
| 2921 #endif | |
| 2922 | |
| 2923 ngx_http_upstream_finalize_request(r, u, status); | |
| 2924 return; | |
| 2925 } | |
| 2926 } | |
| 2927 | |
| 2928 if (u->peer.connection) { | |
| 2929 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 2930 "close http upstream connection: %d", | |
| 2931 u->peer.connection->fd); | |
| 577 | 2932 #if (NGX_HTTP_SSL) |
| 884 | 2933 |
| 577 | 2934 if (u->peer.connection->ssl) { |
| 884 | 2935 u->peer.connection->ssl->no_wait_shutdown = 1; |
| 2936 u->peer.connection->ssl->no_send_shutdown = 1; | |
| 2937 | |
| 2938 (void) ngx_ssl_shutdown(u->peer.connection); | |
| 577 | 2939 } |
| 2940 #endif | |
| 884 | 2941 |
|
4138
70e1ee2307f9
Fix of separate pool for upstream connections (r4117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4124
diff
changeset
|
2942 if (u->peer.connection->pool) { |
|
70e1ee2307f9
Fix of separate pool for upstream connections (r4117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4124
diff
changeset
|
2943 ngx_destroy_pool(u->peer.connection->pool); |
|
70e1ee2307f9
Fix of separate pool for upstream connections (r4117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4124
diff
changeset
|
2944 } |
|
70e1ee2307f9
Fix of separate pool for upstream connections (r4117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4124
diff
changeset
|
2945 |
| 479 | 2946 ngx_close_connection(u->peer.connection); |
|
4143
114e3a7c3b8d
Upstream: clearing of u->peer.connection on close.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4138
diff
changeset
|
2947 u->peer.connection = NULL; |
| 479 | 2948 } |
| 2949 | |
| 2950 #if 0 | |
| 2951 if (u->conf->busy_lock && !u->busy_locked) { | |
| 2952 ngx_http_upstream_busy_lock(p); | |
| 2953 return; | |
| 2954 } | |
| 2955 #endif | |
| 2956 | |
| 2957 ngx_http_upstream_connect(r, u); | |
| 2958 } | |
| 2959 | |
| 2960 | |
| 487 | 2961 static void |
| 569 | 2962 ngx_http_upstream_cleanup(void *data) |
| 2963 { | |
| 2964 ngx_http_request_t *r = data; | |
| 2965 | |
| 1705 | 2966 ngx_http_upstream_t *u; |
| 2967 | |
| 569 | 2968 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 2969 "cleanup http upstream request: \"%V\"", &r->uri); | |
| 2970 | |
| 1705 | 2971 u = r->upstream; |
| 2972 | |
| 2973 if (u->resolved && u->resolved->ctx) { | |
| 2974 ngx_resolve_name_done(u->resolved->ctx); | |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
2975 u->resolved->ctx = NULL; |
| 1658 | 2976 } |
| 2977 | |
| 1705 | 2978 ngx_http_upstream_finalize_request(r, u, NGX_DONE); |
| 569 | 2979 } |
| 2980 | |
| 2981 | |
| 2982 static void | |
| 487 | 2983 ngx_http_upstream_finalize_request(ngx_http_request_t *r, |
| 2984 ngx_http_upstream_t *u, ngx_int_t rc) | |
| 479 | 2985 { |
|
889
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
2986 ngx_time_t *tp; |
| 563 | 2987 |
| 483 | 2988 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 2989 "finalize http upstream request: %i", rc); | |
| 479 | 2990 |
| 2413 | 2991 if (u->cleanup) { |
| 2992 *u->cleanup = NULL; | |
|
3418
a076e1823737
delete u->cleanup mark, this fixes large values in $upstream_response_time,
Igor Sysoev <igor@sysoev.ru>
parents:
3401
diff
changeset
|
2993 u->cleanup = NULL; |
| 2413 | 2994 } |
| 569 | 2995 |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
2996 if (u->resolved && u->resolved->ctx) { |
|
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
2997 ngx_resolve_name_done(u->resolved->ctx); |
|
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
2998 u->resolved->ctx = NULL; |
|
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
2999 } |
|
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
3000 |
| 1658 | 3001 if (u->state && u->state->response_sec) { |
| 563 | 3002 tp = ngx_timeofday(); |
|
889
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
3003 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
|
3004 u->state->response_msec = tp->msec - u->state->response_msec; |
| 2402 | 3005 |
| 3006 if (u->pipe) { | |
| 3007 u->state->response_length = u->pipe->read_length; | |
| 3008 } | |
| 563 | 3009 } |
| 3010 | |
| 479 | 3011 u->finalize_request(r, rc); |
| 3012 | |
| 1658 | 3013 if (u->peer.free) { |
| 3014 u->peer.free(&u->peer, u->peer.data, 0); | |
| 3015 } | |
| 884 | 3016 |
| 479 | 3017 if (u->peer.connection) { |
| 884 | 3018 |
| 577 | 3019 #if (NGX_HTTP_SSL) |
| 3020 | |
| 3021 /* TODO: do not shutdown persistent connection */ | |
| 3022 | |
| 3023 if (u->peer.connection->ssl) { | |
| 884 | 3024 |
| 3025 /* | |
| 3026 * We send the "close notify" shutdown alert to the upstream only | |
| 3027 * and do not wait its "close notify" shutdown alert. | |
| 3028 * It is acceptable according to the TLS standard. | |
| 3029 */ | |
| 3030 | |
| 3031 u->peer.connection->ssl->no_wait_shutdown = 1; | |
| 3032 | |
| 3033 (void) ngx_ssl_shutdown(u->peer.connection); | |
| 577 | 3034 } |
| 3035 #endif | |
| 884 | 3036 |
| 3037 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 3038 "close http upstream connection: %d", | |
| 3039 u->peer.connection->fd); | |
| 3040 | |
|
4138
70e1ee2307f9
Fix of separate pool for upstream connections (r4117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4124
diff
changeset
|
3041 if (u->peer.connection->pool) { |
|
70e1ee2307f9
Fix of separate pool for upstream connections (r4117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4124
diff
changeset
|
3042 ngx_destroy_pool(u->peer.connection->pool); |
|
70e1ee2307f9
Fix of separate pool for upstream connections (r4117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4124
diff
changeset
|
3043 } |
|
70e1ee2307f9
Fix of separate pool for upstream connections (r4117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4124
diff
changeset
|
3044 |
| 479 | 3045 ngx_close_connection(u->peer.connection); |
| 3046 } | |
| 3047 | |
| 483 | 3048 u->peer.connection = NULL; |
| 3049 | |
| 581 | 3050 if (u->pipe && u->pipe->temp_file) { |
| 479 | 3051 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 3052 "http upstream temp fd: %d", | |
| 581 | 3053 u->pipe->temp_file->file.fd); |
| 479 | 3054 } |
| 3055 | |
|
4469
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
3056 if (u->store && u->pipe && u->pipe->temp_file |
|
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
3057 && u->pipe->temp_file->file.fd != NGX_INVALID_FILE) |
|
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
3058 { |
|
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
3059 if (ngx_delete_file(u->pipe->temp_file->file.name.data) |
|
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
3060 == NGX_FILE_ERROR) |
|
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
3061 { |
|
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
3062 ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno, |
|
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
3063 ngx_delete_file_n " \"%s\" failed", |
|
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
3064 u->pipe->temp_file->file.name.data); |
|
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
3065 } |
|
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
3066 } |
|
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
3067 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3068 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3069 |
|
3940
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
3070 if (r->cache) { |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
3071 |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
3072 if (u->cacheable) { |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
3073 |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
3074 if (rc == NGX_HTTP_BAD_GATEWAY || rc == NGX_HTTP_GATEWAY_TIME_OUT) { |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
3075 time_t valid; |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
3076 |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
3077 valid = ngx_http_file_cache_valid(u->conf->cache_valid, rc); |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
3078 |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
3079 if (valid) { |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
3080 r->cache->valid_sec = ngx_time() + valid; |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
3081 r->cache->error = rc; |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
3082 } |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3083 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3084 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3085 |
|
3711
ce6ba077c270
several changes in cache cleanup handling:
Igor Sysoev <igor@sysoev.ru>
parents:
3709
diff
changeset
|
3086 ngx_http_file_cache_free(r->cache, u->pipe->temp_file); |
| 479 | 3087 } |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3088 |
| 479 | 3089 #endif |
| 3090 | |
| 2692 | 3091 if (u->header_sent |
|
3963
10fbb8f02a45
finalizing with rc == 0 in unbuffered proxy mode caused nginx to wait
Igor Sysoev <igor@sysoev.ru>
parents:
3944
diff
changeset
|
3092 && rc != NGX_HTTP_REQUEST_TIME_OUT |
| 2692 | 3093 && (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE)) |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3094 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3095 rc = 0; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3096 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3097 |
| 515 | 3098 if (rc == NGX_DECLINED) { |
| 3099 return; | |
| 3100 } | |
| 3101 | |
| 483 | 3102 r->connection->log->action = "sending to client"; |
| 3103 | |
|
4151
3549db8ceaf2
Cache: fix for sending of stale responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4143
diff
changeset
|
3104 if (rc == 0 |
|
4990
e2794322ec76
Fixed HEAD requests handling when proxying is used (closes #261).
Valentin Bartenev <vbart@nginx.com>
parents:
4964
diff
changeset
|
3105 && !r->header_only |
|
4151
3549db8ceaf2
Cache: fix for sending of stale responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4143
diff
changeset
|
3106 #if (NGX_HTTP_CACHE) |
|
3549db8ceaf2
Cache: fix for sending of stale responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4143
diff
changeset
|
3107 && !r->cached |
|
3549db8ceaf2
Cache: fix for sending of stale responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4143
diff
changeset
|
3108 #endif |
|
3549db8ceaf2
Cache: fix for sending of stale responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4143
diff
changeset
|
3109 ) |
|
3549db8ceaf2
Cache: fix for sending of stale responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4143
diff
changeset
|
3110 { |
|
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
3111 rc = ngx_http_send_special(r, NGX_HTTP_LAST); |
| 479 | 3112 } |
| 3113 | |
| 3114 ngx_http_finalize_request(r, rc); | |
| 3115 } | |
| 3116 | |
| 3117 | |
| 509 | 3118 static ngx_int_t |
| 3119 ngx_http_upstream_process_header_line(ngx_http_request_t *r, ngx_table_elt_t *h, | |
| 3120 ngx_uint_t offset) | |
| 577 | 3121 { |
| 509 | 3122 ngx_table_elt_t **ph; |
| 577 | 3123 |
| 509 | 3124 ph = (ngx_table_elt_t **) ((char *) &r->upstream->headers_in + offset); |
| 3125 | |
| 3126 if (*ph == NULL) { | |
| 3127 *ph = h; | |
| 3128 } | |
| 3129 | |
| 3130 return NGX_OK; | |
| 3131 } | |
| 3132 | |
| 3133 | |
| 3134 static ngx_int_t | |
|
2669
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3135 ngx_http_upstream_ignore_header_line(ngx_http_request_t *r, ngx_table_elt_t *h, |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3136 ngx_uint_t offset) |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3137 { |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3138 return NGX_OK; |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3139 } |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3140 |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3141 |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3142 static ngx_int_t |
|
4117
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
3143 ngx_http_upstream_process_content_length(ngx_http_request_t *r, |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
3144 ngx_table_elt_t *h, ngx_uint_t offset) |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
3145 { |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
3146 ngx_http_upstream_t *u; |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
3147 |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
3148 u = r->upstream; |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
3149 |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
3150 u->headers_in.content_length = h; |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
3151 u->headers_in.content_length_n = ngx_atoof(h->value.data, h->value.len); |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
3152 |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
3153 return NGX_OK; |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
3154 } |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
3155 |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
3156 |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
3157 static ngx_int_t |
|
3669
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3158 ngx_http_upstream_process_set_cookie(ngx_http_request_t *r, ngx_table_elt_t *h, |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3159 ngx_uint_t offset) |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3160 { |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3161 #if (NGX_HTTP_CACHE) |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3162 ngx_http_upstream_t *u; |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3163 |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3164 u = r->upstream; |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3165 |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3166 if (!(u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_SET_COOKIE)) { |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3167 u->cacheable = 0; |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3168 } |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3169 #endif |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3170 |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3171 return NGX_OK; |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3172 } |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3173 |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3174 |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
3175 static ngx_int_t |
|
2669
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3176 ngx_http_upstream_process_cache_control(ngx_http_request_t *r, |
| 509 | 3177 ngx_table_elt_t *h, ngx_uint_t offset) |
| 3178 { | |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3179 ngx_array_t *pa; |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3180 ngx_table_elt_t **ph; |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3181 ngx_http_upstream_t *u; |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3182 |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3183 u = r->upstream; |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3184 pa = &u->headers_in.cache_control; |
| 509 | 3185 |
| 3186 if (pa->elts == NULL) { | |
| 3187 if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *)) != NGX_OK) | |
| 3188 { | |
| 3189 return NGX_ERROR; | |
| 3190 } | |
| 3191 } | |
| 3192 | |
| 3193 ph = ngx_array_push(pa); | |
| 3194 if (ph == NULL) { | |
| 3195 return NGX_ERROR; | |
| 3196 } | |
| 3197 | |
| 3198 *ph = h; | |
| 3199 | |
|
2708
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3200 #if (NGX_HTTP_CACHE) |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3201 { |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3202 u_char *p, *last; |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3203 ngx_int_t n; |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3204 |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3205 if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_CACHE_CONTROL) { |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3206 return NGX_OK; |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3207 } |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3208 |
|
2669
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3209 if (r->cache == NULL) { |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3210 return NGX_OK; |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3211 } |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3212 |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3213 if (r->cache->valid_sec != 0) { |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3214 return NGX_OK; |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3215 } |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3216 |
|
3517
a4ee4a075ac5
do not cache response if it has "no-store" or "private"
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
3217 p = h->value.data; |
|
a4ee4a075ac5
do not cache response if it has "no-store" or "private"
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
3218 last = p + h->value.len; |
|
a4ee4a075ac5
do not cache response if it has "no-store" or "private"
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
3219 |
|
a4ee4a075ac5
do not cache response if it has "no-store" or "private"
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
3220 if (ngx_strlcasestrn(p, last, (u_char *) "no-cache", 8 - 1) != NULL |
|
a4ee4a075ac5
do not cache response if it has "no-store" or "private"
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
3221 || ngx_strlcasestrn(p, last, (u_char *) "no-store", 8 - 1) != NULL |
|
a4ee4a075ac5
do not cache response if it has "no-store" or "private"
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
3222 || ngx_strlcasestrn(p, last, (u_char *) "private", 7 - 1) != NULL) |
|
2669
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3223 { |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3224 u->cacheable = 0; |
|
2669
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3225 return NGX_OK; |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3226 } |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3227 |
|
3517
a4ee4a075ac5
do not cache response if it has "no-store" or "private"
Igor Sysoev <igor@sysoev.ru>
parents:
3516
diff
changeset
|
3228 p = ngx_strlcasestrn(p, last, (u_char *) "max-age=", 8 - 1); |
|
2669
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3229 |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3230 if (p == NULL) { |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3231 return NGX_OK; |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3232 } |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3233 |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3234 n = 0; |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3235 |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3236 for (p += 8; p < last; p++) { |
|
3198
48bfb7dc981b
test comma separator in "Cache-Control"
Igor Sysoev <igor@sysoev.ru>
parents:
3195
diff
changeset
|
3237 if (*p == ',' || *p == ';' || *p == ' ') { |
|
2669
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3238 break; |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3239 } |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3240 |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3241 if (*p >= '0' && *p <= '9') { |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3242 n = n * 10 + *p - '0'; |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3243 continue; |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3244 } |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3245 |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3246 u->cacheable = 0; |
|
2669
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3247 return NGX_OK; |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3248 } |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3249 |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3250 if (n == 0) { |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3251 u->cacheable = 0; |
|
2669
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3252 return NGX_OK; |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3253 } |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3254 |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
3255 r->cache->valid_sec = ngx_time() + n; |
|
2708
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3256 } |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3257 #endif |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3258 |
| 509 | 3259 return NGX_OK; |
| 3260 } | |
| 3261 | |
| 3262 | |
| 3263 static ngx_int_t | |
| 2666 | 3264 ngx_http_upstream_process_expires(ngx_http_request_t *r, ngx_table_elt_t *h, |
| 3265 ngx_uint_t offset) | |
| 3266 { | |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3267 ngx_http_upstream_t *u; |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3268 |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3269 u = r->upstream; |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3270 u->headers_in.expires = h; |
|
2708
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3271 |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3272 #if (NGX_HTTP_CACHE) |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3273 { |
| 2666 | 3274 time_t expires; |
| 3275 | |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3276 if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_EXPIRES) { |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3277 return NGX_OK; |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3278 } |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3279 |
| 2666 | 3280 if (r->cache == NULL) { |
| 3281 return NGX_OK; | |
| 3282 } | |
| 3283 | |
| 3284 if (r->cache->valid_sec != 0) { | |
| 3285 return NGX_OK; | |
| 3286 } | |
| 3287 | |
| 3288 expires = ngx_http_parse_time(h->value.data, h->value.len); | |
| 3289 | |
| 3290 if (expires == NGX_ERROR || expires < ngx_time()) { | |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3291 u->cacheable = 0; |
| 2666 | 3292 return NGX_OK; |
| 3293 } | |
| 3294 | |
| 3295 r->cache->valid_sec = expires; | |
|
2708
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3296 } |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3297 #endif |
| 2666 | 3298 |
| 3299 return NGX_OK; | |
| 3300 } | |
| 3301 | |
| 3302 | |
| 3303 static ngx_int_t | |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3304 ngx_http_upstream_process_accel_expires(ngx_http_request_t *r, |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3305 ngx_table_elt_t *h, ngx_uint_t offset) |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3306 { |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3307 ngx_http_upstream_t *u; |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3308 |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3309 u = r->upstream; |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3310 u->headers_in.x_accel_expires = h; |
|
2708
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3311 |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3312 #if (NGX_HTTP_CACHE) |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3313 { |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3314 u_char *p; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3315 size_t len; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3316 ngx_int_t n; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3317 |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3318 if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_XA_EXPIRES) { |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3319 return NGX_OK; |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3320 } |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3321 |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3322 if (r->cache == NULL) { |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3323 return NGX_OK; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3324 } |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3325 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3326 len = h->value.len; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3327 p = h->value.data; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3328 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3329 if (p[0] != '@') { |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3330 n = ngx_atoi(p, len); |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3331 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3332 switch (n) { |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3333 case 0: |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
3334 u->cacheable = 0; |
|
4546
4988fa232629
For the sake of case/switch code readability, 'fall through'
Maxim Konovalov <maxim@nginx.com>
parents:
4499
diff
changeset
|
3335 /* fall through */ |
|
4988fa232629
For the sake of case/switch code readability, 'fall through'
Maxim Konovalov <maxim@nginx.com>
parents:
4499
diff
changeset
|
3336 |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3337 case NGX_ERROR: |
| 2667 | 3338 return NGX_OK; |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3339 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3340 default: |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3341 r->cache->valid_sec = ngx_time() + n; |
| 2667 | 3342 return NGX_OK; |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3343 } |
| 2667 | 3344 } |
| 3345 | |
| 3346 p++; | |
| 3347 len--; | |
| 3348 | |
| 3349 n = ngx_atoi(p, len); | |
| 3350 | |
| 3351 if (n != NGX_ERROR) { | |
| 3352 r->cache->valid_sec = n; | |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3353 } |
|
2708
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3354 } |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
3355 #endif |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3356 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3357 return NGX_OK; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3358 } |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3359 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3360 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3361 static ngx_int_t |
| 527 | 3362 ngx_http_upstream_process_limit_rate(ngx_http_request_t *r, ngx_table_elt_t *h, |
| 3363 ngx_uint_t offset) | |
| 577 | 3364 { |
|
4197
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3365 ngx_int_t n; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3366 ngx_http_upstream_t *u; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3367 |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3368 u = r->upstream; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3369 u->headers_in.x_accel_limit_rate = h; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3370 |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3371 if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_XA_LIMIT_RATE) { |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3372 return NGX_OK; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3373 } |
| 527 | 3374 |
| 3375 n = ngx_atoi(h->value.data, h->value.len); | |
| 3376 | |
| 3377 if (n != NGX_ERROR) { | |
| 3378 r->limit_rate = (size_t) n; | |
| 3379 } | |
| 3380 | |
| 3381 return NGX_OK; | |
| 3382 } | |
| 3383 | |
| 3384 | |
| 3385 static ngx_int_t | |
| 649 | 3386 ngx_http_upstream_process_buffering(ngx_http_request_t *r, ngx_table_elt_t *h, |
| 3387 ngx_uint_t offset) | |
| 3388 { | |
|
4197
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3389 u_char c0, c1, c2; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3390 ngx_http_upstream_t *u; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3391 |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3392 u = r->upstream; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3393 |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3394 if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_XA_BUFFERING) { |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3395 return NGX_OK; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3396 } |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3397 |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3398 if (u->conf->change_buffering) { |
| 649 | 3399 |
| 3400 if (h->value.len == 2) { | |
| 3401 c0 = ngx_tolower(h->value.data[0]); | |
| 3402 c1 = ngx_tolower(h->value.data[1]); | |
| 3403 | |
| 3404 if (c0 == 'n' && c1 == 'o') { | |
|
4197
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3405 u->buffering = 0; |
| 649 | 3406 } |
| 3407 | |
| 3408 } else if (h->value.len == 3) { | |
| 3409 c0 = ngx_tolower(h->value.data[0]); | |
| 3410 c1 = ngx_tolower(h->value.data[1]); | |
| 3411 c2 = ngx_tolower(h->value.data[2]); | |
| 3412 | |
| 3413 if (c0 == 'y' && c1 == 'e' && c2 == 's') { | |
|
4197
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3414 u->buffering = 1; |
| 649 | 3415 } |
| 3416 } | |
| 3417 } | |
| 3418 | |
| 3419 return NGX_OK; | |
| 3420 } | |
| 3421 | |
| 3422 | |
| 3423 static ngx_int_t | |
| 657 | 3424 ngx_http_upstream_process_charset(ngx_http_request_t *r, ngx_table_elt_t *h, |
| 3425 ngx_uint_t offset) | |
| 3426 { | |
|
4197
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3427 if (r->upstream->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_XA_CHARSET) { |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3428 return NGX_OK; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3429 } |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
3430 |
| 657 | 3431 r->headers_out.override_charset = &h->value; |
| 3432 | |
| 3433 return NGX_OK; | |
| 3434 } | |
| 3435 | |
| 3436 | |
| 3437 static ngx_int_t | |
|
4124
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
3438 ngx_http_upstream_process_connection(ngx_http_request_t *r, ngx_table_elt_t *h, |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
3439 ngx_uint_t offset) |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
3440 { |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
3441 r->upstream->headers_in.connection = h; |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
3442 |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
3443 if (ngx_strlcasestrn(h->value.data, h->value.data + h->value.len, |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
3444 (u_char *) "close", 5 - 1) |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
3445 != NULL) |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
3446 { |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
3447 r->upstream->headers_in.connection_close = 1; |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
3448 } |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
3449 |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
3450 return NGX_OK; |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
3451 } |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
3452 |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
3453 |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
3454 static ngx_int_t |
|
4123
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
3455 ngx_http_upstream_process_transfer_encoding(ngx_http_request_t *r, |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
3456 ngx_table_elt_t *h, ngx_uint_t offset) |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
3457 { |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
3458 r->upstream->headers_in.transfer_encoding = h; |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
3459 |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
3460 if (ngx_strlcasestrn(h->value.data, h->value.data + h->value.len, |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
3461 (u_char *) "chunked", 7 - 1) |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
3462 != NULL) |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
3463 { |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
3464 r->upstream->headers_in.chunked = 1; |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
3465 } |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
3466 |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
3467 return NGX_OK; |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
3468 } |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
3469 |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
3470 |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
3471 static ngx_int_t |
| 509 | 3472 ngx_http_upstream_copy_header_line(ngx_http_request_t *r, ngx_table_elt_t *h, |
| 3473 ngx_uint_t offset) | |
| 3474 { | |
| 573 | 3475 ngx_table_elt_t *ho, **ph; |
| 509 | 3476 |
| 3477 ho = ngx_list_push(&r->headers_out.headers); | |
| 3478 if (ho == NULL) { | |
| 3479 return NGX_ERROR; | |
| 3480 } | |
| 3481 | |
| 3482 *ho = *h; | |
| 3483 | |
| 573 | 3484 if (offset) { |
| 3485 ph = (ngx_table_elt_t **) ((char *) &r->headers_out + offset); | |
| 3486 *ph = ho; | |
| 3487 } | |
| 3488 | |
| 509 | 3489 return NGX_OK; |
| 3490 } | |
| 3491 | |
| 3492 | |
| 3493 static ngx_int_t | |
| 3494 ngx_http_upstream_copy_multi_header_lines(ngx_http_request_t *r, | |
| 3495 ngx_table_elt_t *h, ngx_uint_t offset) | |
| 3496 { | |
| 3497 ngx_array_t *pa; | |
| 3498 ngx_table_elt_t *ho, **ph; | |
| 3499 | |
| 3500 pa = (ngx_array_t *) ((char *) &r->headers_out + offset); | |
| 3501 | |
| 3502 if (pa->elts == NULL) { | |
| 3503 if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *)) != NGX_OK) | |
| 3504 { | |
| 3505 return NGX_ERROR; | |
| 3506 } | |
| 3507 } | |
| 3508 | |
| 3509 ph = ngx_array_push(pa); | |
| 3510 if (ph == NULL) { | |
| 3511 return NGX_ERROR; | |
| 3512 } | |
| 3513 | |
| 3514 ho = ngx_list_push(&r->headers_out.headers); | |
| 3515 if (ho == NULL) { | |
| 3516 return NGX_ERROR; | |
| 3517 } | |
| 3518 | |
| 3519 *ho = *h; | |
| 3520 *ph = ho; | |
| 3521 | |
| 3522 return NGX_OK; | |
| 3523 } | |
| 3524 | |
| 3525 | |
| 3526 static ngx_int_t | |
| 3527 ngx_http_upstream_copy_content_type(ngx_http_request_t *r, ngx_table_elt_t *h, | |
| 3528 ngx_uint_t offset) | |
| 3529 { | |
| 657 | 3530 u_char *p, *last; |
| 3531 | |
| 3532 r->headers_out.content_type_len = h->value.len; | |
| 509 | 3533 r->headers_out.content_type = h->value; |
|
2882
896db5a09bd2
reset content_type hash value, this fixes a bug when XSLT responses
Igor Sysoev <igor@sysoev.ru>
parents:
2875
diff
changeset
|
3534 r->headers_out.content_type_lowcase = NULL; |
| 509 | 3535 |
| 657 | 3536 for (p = h->value.data; *p; p++) { |
| 3537 | |
| 3538 if (*p != ';') { | |
| 3539 continue; | |
| 3540 } | |
| 3541 | |
| 3542 last = p; | |
| 3543 | |
| 3544 while (*++p == ' ') { /* void */ } | |
| 3545 | |
| 1968 | 3546 if (*p == '\0') { |
| 3547 return NGX_OK; | |
| 3548 } | |
| 3549 | |
|
1107
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1098
diff
changeset
|
3550 if (ngx_strncasecmp(p, (u_char *) "charset=", 8) != 0) { |
| 657 | 3551 continue; |
| 3552 } | |
| 3553 | |
| 3554 p += 8; | |
| 3555 | |
| 3556 r->headers_out.content_type_len = last - h->value.data; | |
| 3557 | |
| 2244 | 3558 if (*p == '"') { |
| 3559 p++; | |
| 3560 } | |
| 3561 | |
| 3562 last = h->value.data + h->value.len; | |
| 3563 | |
| 3564 if (*(last - 1) == '"') { | |
| 3565 last--; | |
| 3566 } | |
| 3567 | |
| 3568 r->headers_out.charset.len = last - p; | |
| 657 | 3569 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
|
3570 |
|
c6c42497106c
fix segfault if upstream sends trailing ";" in "charset="
Igor Sysoev <igor@sysoev.ru>
parents:
1109
diff
changeset
|
3571 return NGX_OK; |
| 657 | 3572 } |
| 3573 | |
| 509 | 3574 return NGX_OK; |
| 3575 } | |
| 3576 | |
| 3577 | |
| 3578 static ngx_int_t | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3579 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
|
3580 ngx_uint_t offset) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3581 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3582 ngx_table_elt_t *ho; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3583 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3584 ho = ngx_list_push(&r->headers_out.headers); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3585 if (ho == NULL) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3586 return NGX_ERROR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3587 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3588 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3589 *ho = *h; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3590 |
|
3004
4121acaf7a04
fix handling "Last-Modified" and "Accept-Ranges" for upstream responses
Igor Sysoev <igor@sysoev.ru>
parents:
3003
diff
changeset
|
3591 r->headers_out.last_modified = ho; |
|
4121acaf7a04
fix handling "Last-Modified" and "Accept-Ranges" for upstream responses
Igor Sysoev <igor@sysoev.ru>
parents:
3003
diff
changeset
|
3592 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3593 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3594 |
| 2952 | 3595 if (r->upstream->cacheable) { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3596 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
|
3597 h->value.len); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3598 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3599 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3600 #endif |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3601 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3602 return NGX_OK; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3603 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3604 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3605 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3606 static ngx_int_t |
| 509 | 3607 ngx_http_upstream_rewrite_location(ngx_http_request_t *r, ngx_table_elt_t *h, |
| 3608 ngx_uint_t offset) | |
| 3609 { | |
| 3610 ngx_int_t rc; | |
| 3611 ngx_table_elt_t *ho; | |
| 3612 | |
| 3613 ho = ngx_list_push(&r->headers_out.headers); | |
| 3614 if (ho == NULL) { | |
| 3615 return NGX_ERROR; | |
| 3616 } | |
| 3617 | |
| 3618 *ho = *h; | |
| 3619 | |
| 3620 if (r->upstream->rewrite_redirect) { | |
| 3621 rc = r->upstream->rewrite_redirect(r, ho, 0); | |
| 3622 | |
| 529 | 3623 if (rc == NGX_DECLINED) { |
| 3624 return NGX_OK; | |
| 3625 } | |
| 3626 | |
| 509 | 3627 if (rc == NGX_OK) { |
| 3628 r->headers_out.location = ho; | |
| 3629 | |
| 3630 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 3631 "rewritten location: \"%V\"", &ho->value); | |
| 3632 } | |
| 3633 | |
| 3634 return rc; | |
| 3635 } | |
| 3636 | |
|
1653
ea681a6a0c61
set r->headers_out.location for non-local redirects
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
3637 if (ho->value.data[0] != '/') { |
|
ea681a6a0c61
set r->headers_out.location for non-local redirects
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
3638 r->headers_out.location = ho; |
|
ea681a6a0c61
set r->headers_out.location for non-local redirects
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
3639 } |
|
ea681a6a0c61
set r->headers_out.location for non-local redirects
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
3640 |
| 509 | 3641 /* |
| 3642 * we do not set r->headers_out.location here to avoid the handling | |
| 3643 * the local redirects without a host name by ngx_http_header_filter() | |
| 3644 */ | |
| 3645 | |
| 3646 return NGX_OK; | |
| 3647 } | |
| 3648 | |
| 3649 | |
| 3650 static ngx_int_t | |
| 3651 ngx_http_upstream_rewrite_refresh(ngx_http_request_t *r, ngx_table_elt_t *h, | |
| 3652 ngx_uint_t offset) | |
| 3653 { | |
| 3654 u_char *p; | |
| 3655 ngx_int_t rc; | |
| 3656 ngx_table_elt_t *ho; | |
| 3657 | |
| 3658 ho = ngx_list_push(&r->headers_out.headers); | |
| 3659 if (ho == NULL) { | |
| 3660 return NGX_ERROR; | |
| 3661 } | |
| 3662 | |
| 3663 *ho = *h; | |
| 3664 | |
| 3665 if (r->upstream->rewrite_redirect) { | |
| 3666 | |
| 1549 | 3667 p = ngx_strcasestrn(ho->value.data, "url=", 4 - 1); |
| 509 | 3668 |
| 3669 if (p) { | |
| 3670 rc = r->upstream->rewrite_redirect(r, ho, p + 4 - ho->value.data); | |
| 3671 | |
| 3672 } else { | |
| 3673 return NGX_OK; | |
| 3674 } | |
| 3675 | |
| 529 | 3676 if (rc == NGX_DECLINED) { |
| 3677 return NGX_OK; | |
| 3678 } | |
| 3679 | |
| 509 | 3680 if (rc == NGX_OK) { |
| 1654 | 3681 r->headers_out.refresh = ho; |
| 3682 | |
| 509 | 3683 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 3684 "rewritten refresh: \"%V\"", &ho->value); | |
| 3685 } | |
| 3686 | |
| 3687 return rc; | |
| 3688 } | |
| 3689 | |
| 1654 | 3690 r->headers_out.refresh = ho; |
| 3691 | |
| 509 | 3692 return NGX_OK; |
| 3693 } | |
| 3694 | |
| 3695 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3696 static ngx_int_t |
|
4464
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3697 ngx_http_upstream_rewrite_set_cookie(ngx_http_request_t *r, ngx_table_elt_t *h, |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3698 ngx_uint_t offset) |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3699 { |
|
4650
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
3700 ngx_int_t rc; |
|
4464
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3701 ngx_table_elt_t *ho; |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3702 |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3703 ho = ngx_list_push(&r->headers_out.headers); |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3704 if (ho == NULL) { |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3705 return NGX_ERROR; |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3706 } |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3707 |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3708 *ho = *h; |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3709 |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3710 if (r->upstream->rewrite_cookie) { |
|
4650
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
3711 rc = r->upstream->rewrite_cookie(r, ho); |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
3712 |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
3713 if (rc == NGX_DECLINED) { |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
3714 return NGX_OK; |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
3715 } |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
3716 |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
3717 #if (NGX_DEBUG) |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
3718 if (rc == NGX_OK) { |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
3719 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
3720 "rewritten cookie: \"%V\"", &ho->value); |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
3721 } |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
3722 #endif |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
3723 |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
3724 return rc; |
|
4464
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3725 } |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3726 |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3727 return NGX_OK; |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3728 } |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3729 |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3730 |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
3731 static ngx_int_t |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3732 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
|
3733 ngx_table_elt_t *h, ngx_uint_t offset) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3734 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3735 ngx_table_elt_t *ho; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3736 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3737 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3738 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3739 if (r->cached) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3740 r->allow_ranges = 1; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3741 return NGX_OK; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3742 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3743 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3744 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3745 #endif |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3746 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3747 ho = ngx_list_push(&r->headers_out.headers); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3748 if (ho == NULL) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3749 return NGX_ERROR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3750 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3751 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3752 *ho = *h; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3753 |
|
3004
4121acaf7a04
fix handling "Last-Modified" and "Accept-Ranges" for upstream responses
Igor Sysoev <igor@sysoev.ru>
parents:
3003
diff
changeset
|
3754 r->headers_out.accept_ranges = ho; |
|
4121acaf7a04
fix handling "Last-Modified" and "Accept-Ranges" for upstream responses
Igor Sysoev <igor@sysoev.ru>
parents:
3003
diff
changeset
|
3755 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3756 return NGX_OK; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3757 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3758 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3759 |
| 509 | 3760 #if (NGX_HTTP_GZIP) |
| 3761 | |
| 3762 static ngx_int_t | |
| 3763 ngx_http_upstream_copy_content_encoding(ngx_http_request_t *r, | |
| 3764 ngx_table_elt_t *h, ngx_uint_t offset) | |
| 3765 { | |
| 3766 ngx_table_elt_t *ho; | |
| 3767 | |
| 3768 ho = ngx_list_push(&r->headers_out.headers); | |
| 3769 if (ho == NULL) { | |
| 3770 return NGX_ERROR; | |
| 3771 } | |
| 3772 | |
| 3773 *ho = *h; | |
| 3774 | |
| 3775 r->headers_out.content_encoding = ho; | |
| 3776 | |
| 3777 return NGX_OK; | |
| 3778 } | |
| 3779 | |
| 3780 #endif | |
| 3781 | |
| 3782 | |
| 487 | 3783 static ngx_int_t |
| 573 | 3784 ngx_http_upstream_add_variables(ngx_conf_t *cf) |
| 479 | 3785 { |
| 880 | 3786 ngx_http_variable_t *var, *v; |
| 479 | 3787 |
| 573 | 3788 for (v = ngx_http_upstream_vars; v->name.len; v++) { |
| 3789 var = ngx_http_add_variable(cf, &v->name, v->flags); | |
| 3790 if (var == NULL) { | |
| 3791 return NGX_ERROR; | |
| 3792 } | |
| 3793 | |
| 637 | 3794 var->get_handler = v->get_handler; |
| 573 | 3795 var->data = v->data; |
| 3796 } | |
| 3797 | |
| 479 | 3798 return NGX_OK; |
| 3799 } | |
| 509 | 3800 |
| 3801 | |
| 573 | 3802 static ngx_int_t |
| 1181 | 3803 ngx_http_upstream_addr_variable(ngx_http_request_t *r, |
| 3804 ngx_http_variable_value_t *v, uintptr_t data) | |
| 3805 { | |
| 3806 u_char *p; | |
| 3807 size_t len; | |
| 3808 ngx_uint_t i; | |
| 3809 ngx_http_upstream_state_t *state; | |
| 3810 | |
| 3811 v->valid = 1; | |
| 1565 | 3812 v->no_cacheable = 0; |
| 1181 | 3813 v->not_found = 0; |
| 3814 | |
| 3815 if (r->upstream_states == NULL || r->upstream_states->nelts == 0) { | |
| 3816 v->not_found = 1; | |
| 3817 return NGX_OK; | |
| 3818 } | |
| 3819 | |
| 3820 len = 0; | |
| 3821 state = r->upstream_states->elts; | |
| 3822 | |
| 3823 for (i = 0; i < r->upstream_states->nelts; i++) { | |
| 3824 if (state[i].peer) { | |
| 3825 len += state[i].peer->len + 2; | |
| 3826 | |
| 3827 } else { | |
| 3828 len += 3; | |
| 3829 } | |
| 3830 } | |
| 3831 | |
| 2049 | 3832 p = ngx_pnalloc(r->pool, len); |
| 1181 | 3833 if (p == NULL) { |
| 3834 return NGX_ERROR; | |
| 3835 } | |
| 3836 | |
| 3837 v->data = p; | |
| 3838 | |
| 3839 i = 0; | |
| 3840 | |
| 3841 for ( ;; ) { | |
| 3842 if (state[i].peer) { | |
| 3843 p = ngx_cpymem(p, state[i].peer->data, state[i].peer->len); | |
| 3844 } | |
| 3845 | |
| 3846 if (++i == r->upstream_states->nelts) { | |
| 3847 break; | |
| 3848 } | |
| 3849 | |
| 3850 if (state[i].peer) { | |
| 3851 *p++ = ','; | |
| 3852 *p++ = ' '; | |
| 3853 | |
| 3854 } else { | |
| 3855 *p++ = ' '; | |
| 3856 *p++ = ':'; | |
| 3857 *p++ = ' '; | |
| 3858 | |
| 3859 if (++i == r->upstream_states->nelts) { | |
| 3860 break; | |
| 3861 } | |
| 3862 | |
| 3863 continue; | |
| 3864 } | |
| 3865 } | |
| 3866 | |
| 3867 v->len = p - v->data; | |
| 3868 | |
| 3869 return NGX_OK; | |
| 3870 } | |
| 3871 | |
| 3872 | |
| 3873 static ngx_int_t | |
| 573 | 3874 ngx_http_upstream_status_variable(ngx_http_request_t *r, |
| 3875 ngx_http_variable_value_t *v, uintptr_t data) | |
| 3876 { | |
| 3877 u_char *p; | |
| 3878 size_t len; | |
| 3879 ngx_uint_t i; | |
| 3880 ngx_http_upstream_state_t *state; | |
| 3881 | |
| 3882 v->valid = 1; | |
| 1565 | 3883 v->no_cacheable = 0; |
| 573 | 3884 v->not_found = 0; |
| 3885 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3886 if (r->upstream_states == NULL || r->upstream_states->nelts == 0) { |
| 573 | 3887 v->not_found = 1; |
| 3888 return NGX_OK; | |
| 3889 } | |
| 3890 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3891 len = r->upstream_states->nelts * (3 + 2); |
| 573 | 3892 |
| 2049 | 3893 p = ngx_pnalloc(r->pool, len); |
| 573 | 3894 if (p == NULL) { |
| 3895 return NGX_ERROR; | |
| 3896 } | |
| 3897 | |
| 3898 v->data = p; | |
| 3899 | |
| 3900 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
|
3901 state = r->upstream_states->elts; |
| 573 | 3902 |
| 3903 for ( ;; ) { | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3904 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
|
3905 p = ngx_sprintf(p, "%ui", state[i].status); |
| 573 | 3906 |
| 3907 } else { | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3908 *p++ = '-'; |
| 573 | 3909 } |
| 3910 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3911 if (++i == r->upstream_states->nelts) { |
| 573 | 3912 break; |
| 3913 } | |
| 3914 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3915 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
|
3916 *p++ = ','; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3917 *p++ = ' '; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3918 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3919 } else { |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3920 *p++ = ' '; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3921 *p++ = ':'; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3922 *p++ = ' '; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3923 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3924 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
|
3925 break; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3926 } |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3927 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3928 continue; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3929 } |
| 573 | 3930 } |
| 3931 | |
| 3932 v->len = p - v->data; | |
| 3933 | |
| 3934 return NGX_OK; | |
| 3935 } | |
| 3936 | |
| 3937 | |
| 3938 static ngx_int_t | |
| 3939 ngx_http_upstream_response_time_variable(ngx_http_request_t *r, | |
| 3940 ngx_http_variable_value_t *v, uintptr_t data) | |
| 3941 { | |
| 3942 u_char *p; | |
| 3943 size_t len; | |
| 3944 ngx_uint_t i; | |
|
889
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
3945 ngx_msec_int_t ms; |
| 573 | 3946 ngx_http_upstream_state_t *state; |
| 3947 | |
| 3948 v->valid = 1; | |
| 1565 | 3949 v->no_cacheable = 0; |
| 573 | 3950 v->not_found = 0; |
| 3951 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3952 if (r->upstream_states == NULL || r->upstream_states->nelts == 0) { |
| 573 | 3953 v->not_found = 1; |
| 3954 return NGX_OK; | |
| 3955 } | |
| 3956 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3957 len = r->upstream_states->nelts * (NGX_TIME_T_LEN + 4 + 2); |
| 573 | 3958 |
| 2049 | 3959 p = ngx_pnalloc(r->pool, len); |
| 573 | 3960 if (p == NULL) { |
| 3961 return NGX_ERROR; | |
| 3962 } | |
| 3963 | |
| 3964 v->data = p; | |
| 3965 | |
| 3966 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
|
3967 state = r->upstream_states->elts; |
| 573 | 3968 |
| 3969 for ( ;; ) { | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3970 if (state[i].status) { |
| 1640 | 3971 ms = (ngx_msec_int_t) |
| 3972 (state[i].response_sec * 1000 + state[i].response_msec); | |
| 3515 | 3973 ms = ngx_max(ms, 0); |
|
889
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
3974 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
|
3975 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3976 } else { |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3977 *p++ = '-'; |
| 573 | 3978 } |
| 3979 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3980 if (++i == r->upstream_states->nelts) { |
| 573 | 3981 break; |
| 3982 } | |
| 3983 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3984 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
|
3985 *p++ = ','; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3986 *p++ = ' '; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3987 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3988 } else { |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3989 *p++ = ' '; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3990 *p++ = ':'; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3991 *p++ = ' '; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3992 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3993 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
|
3994 break; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3995 } |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3996 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3997 continue; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
3998 } |
| 573 | 3999 } |
| 4000 | |
| 4001 v->len = p - v->data; | |
| 4002 | |
| 4003 return NGX_OK; | |
| 4004 } | |
| 4005 | |
| 4006 | |
| 2402 | 4007 static ngx_int_t |
| 4008 ngx_http_upstream_response_length_variable(ngx_http_request_t *r, | |
| 4009 ngx_http_variable_value_t *v, uintptr_t data) | |
| 4010 { | |
| 4011 u_char *p; | |
| 4012 size_t len; | |
| 4013 ngx_uint_t i; | |
| 4014 ngx_http_upstream_state_t *state; | |
| 4015 | |
| 4016 v->valid = 1; | |
| 4017 v->no_cacheable = 0; | |
| 4018 v->not_found = 0; | |
| 4019 | |
| 4020 if (r->upstream_states == NULL || r->upstream_states->nelts == 0) { | |
| 4021 v->not_found = 1; | |
| 4022 return NGX_OK; | |
| 4023 } | |
| 4024 | |
| 4025 len = r->upstream_states->nelts * (NGX_OFF_T_LEN + 2); | |
| 4026 | |
| 4027 p = ngx_pnalloc(r->pool, len); | |
| 4028 if (p == NULL) { | |
| 4029 return NGX_ERROR; | |
| 4030 } | |
| 4031 | |
| 4032 v->data = p; | |
| 4033 | |
| 4034 i = 0; | |
| 4035 state = r->upstream_states->elts; | |
| 4036 | |
| 4037 for ( ;; ) { | |
| 4038 p = ngx_sprintf(p, "%O", state[i].response_length); | |
| 4039 | |
| 4040 if (++i == r->upstream_states->nelts) { | |
| 4041 break; | |
| 4042 } | |
| 4043 | |
| 4044 if (state[i].peer) { | |
| 4045 *p++ = ','; | |
| 4046 *p++ = ' '; | |
| 4047 | |
| 4048 } else { | |
| 4049 *p++ = ' '; | |
| 4050 *p++ = ':'; | |
| 4051 *p++ = ' '; | |
| 4052 | |
| 4053 if (++i == r->upstream_states->nelts) { | |
| 4054 break; | |
| 4055 } | |
| 4056 | |
| 4057 continue; | |
| 4058 } | |
| 4059 } | |
| 4060 | |
| 4061 v->len = p - v->data; | |
| 4062 | |
| 4063 return NGX_OK; | |
| 4064 } | |
| 4065 | |
| 4066 | |
| 1162 | 4067 ngx_int_t |
| 4068 ngx_http_upstream_header_variable(ngx_http_request_t *r, | |
| 4069 ngx_http_variable_value_t *v, uintptr_t data) | |
| 4070 { | |
| 4071 if (r->upstream == NULL) { | |
| 4072 v->not_found = 1; | |
| 4073 return NGX_OK; | |
| 4074 } | |
| 4075 | |
| 4076 return ngx_http_variable_unknown_header(v, (ngx_str_t *) data, | |
| 4077 &r->upstream->headers_in.headers.part, | |
| 4078 sizeof("upstream_http_") - 1); | |
| 4079 } | |
| 4080 | |
| 4081 | |
| 2952 | 4082 #if (NGX_HTTP_CACHE) |
| 4083 | |
| 4084 ngx_int_t | |
| 4085 ngx_http_upstream_cache_status(ngx_http_request_t *r, | |
| 4086 ngx_http_variable_value_t *v, uintptr_t data) | |
| 4087 { | |
| 4088 ngx_uint_t n; | |
| 4089 | |
| 4090 if (r->upstream == NULL || r->upstream->cache_status == 0) { | |
| 4091 v->not_found = 1; | |
| 4092 return NGX_OK; | |
| 4093 } | |
| 4094 | |
| 4095 n = r->upstream->cache_status - 1; | |
| 4096 | |
| 4097 v->valid = 1; | |
| 4098 v->no_cacheable = 0; | |
| 4099 v->not_found = 0; | |
| 4100 v->len = ngx_http_cache_status[n].len; | |
| 4101 v->data = ngx_http_cache_status[n].data; | |
| 4102 | |
| 4103 return NGX_OK; | |
| 4104 } | |
| 4105 | |
| 4106 #endif | |
| 4107 | |
| 4108 | |
| 651 | 4109 static char * |
| 4110 ngx_http_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy) | |
| 4111 { | |
| 884 | 4112 char *rv; |
| 4113 void *mconf; | |
| 4114 ngx_str_t *value; | |
| 4115 ngx_url_t u; | |
| 4116 ngx_uint_t m; | |
| 4117 ngx_conf_t pcf; | |
| 4118 ngx_http_module_t *module; | |
| 4119 ngx_http_conf_ctx_t *ctx, *http_ctx; | |
| 4120 ngx_http_upstream_srv_conf_t *uscf; | |
| 4121 | |
| 4122 ngx_memzero(&u, sizeof(ngx_url_t)); | |
| 4123 | |
| 4124 value = cf->args->elts; | |
| 4125 u.host = value[1]; | |
| 4126 u.no_resolve = 1; | |
|
5005
c9059bd5445b
Fixed "proxy_pass" with IP address and no port (ticket #276).
Ruslan Ermilov <ru@nginx.com>
parents:
4990
diff
changeset
|
4127 u.no_port = 1; |
| 884 | 4128 |
| 4129 uscf = ngx_http_upstream_add(cf, &u, NGX_HTTP_UPSTREAM_CREATE | |
| 4130 |NGX_HTTP_UPSTREAM_WEIGHT | |
| 4131 |NGX_HTTP_UPSTREAM_MAX_FAILS | |
| 4132 |NGX_HTTP_UPSTREAM_FAIL_TIMEOUT | |
| 4133 |NGX_HTTP_UPSTREAM_DOWN | |
| 4134 |NGX_HTTP_UPSTREAM_BACKUP); | |
| 4135 if (uscf == NULL) { | |
| 4136 return NGX_CONF_ERROR; | |
| 4137 } | |
| 4138 | |
| 651 | 4139 |
| 4140 ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_conf_ctx_t)); | |
| 4141 if (ctx == NULL) { | |
| 4142 return NGX_CONF_ERROR; | |
| 4143 } | |
| 4144 | |
| 884 | 4145 http_ctx = cf->ctx; |
| 4146 ctx->main_conf = http_ctx->main_conf; | |
| 651 | 4147 |
| 4148 /* the upstream{}'s srv_conf */ | |
| 4149 | |
| 4150 ctx->srv_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_http_max_module); | |
| 4151 if (ctx->srv_conf == NULL) { | |
| 4152 return NGX_CONF_ERROR; | |
| 4153 } | |
| 4154 | |
| 4155 ctx->srv_conf[ngx_http_upstream_module.ctx_index] = uscf; | |
| 4156 | |
| 884 | 4157 uscf->srv_conf = ctx->srv_conf; |
| 4158 | |
| 651 | 4159 |
| 4160 /* the upstream{}'s loc_conf */ | |
| 4161 | |
| 4162 ctx->loc_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_http_max_module); | |
| 4163 if (ctx->loc_conf == NULL) { | |
| 4164 return NGX_CONF_ERROR; | |
| 4165 } | |
| 4166 | |
| 4167 for (m = 0; ngx_modules[m]; m++) { | |
| 4168 if (ngx_modules[m]->type != NGX_HTTP_MODULE) { | |
| 4169 continue; | |
| 4170 } | |
| 4171 | |
| 4172 module = ngx_modules[m]->ctx; | |
| 4173 | |
| 884 | 4174 if (module->create_srv_conf) { |
| 4175 mconf = module->create_srv_conf(cf); | |
| 4176 if (mconf == NULL) { | |
| 4177 return NGX_CONF_ERROR; | |
| 4178 } | |
| 4179 | |
| 4180 ctx->srv_conf[ngx_modules[m]->ctx_index] = mconf; | |
| 4181 } | |
| 4182 | |
| 651 | 4183 if (module->create_loc_conf) { |
| 4184 mconf = module->create_loc_conf(cf); | |
| 4185 if (mconf == NULL) { | |
| 4186 return NGX_CONF_ERROR; | |
| 4187 } | |
| 4188 | |
| 4189 ctx->loc_conf[ngx_modules[m]->ctx_index] = mconf; | |
| 4190 } | |
| 4191 } | |
| 4192 | |
| 4193 | |
| 4194 /* parse inside upstream{} */ | |
| 4195 | |
| 4196 pcf = *cf; | |
| 4197 cf->ctx = ctx; | |
| 4198 cf->cmd_type = NGX_HTTP_UPS_CONF; | |
| 4199 | |
| 4200 rv = ngx_conf_parse(cf, NULL); | |
| 4201 | |
| 4202 *cf = pcf; | |
| 4203 | |
| 4204 if (rv != NGX_CONF_OK) { | |
| 4205 return rv; | |
| 4206 } | |
| 4207 | |
| 4208 if (uscf->servers == NULL) { | |
| 4209 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 4210 "no servers are inside upstream"); | |
| 4211 return NGX_CONF_ERROR; | |
| 4212 } | |
| 4213 | |
| 4214 return rv; | |
| 4215 } | |
| 4216 | |
| 4217 | |
| 4218 static char * | |
| 4219 ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 4220 { | |
| 4221 ngx_http_upstream_srv_conf_t *uscf = conf; | |
| 4222 | |
| 884 | 4223 time_t fail_timeout; |
| 4224 ngx_str_t *value, s; | |
| 4225 ngx_url_t u; | |
| 4226 ngx_int_t weight, max_fails; | |
| 4227 ngx_uint_t i; | |
| 4228 ngx_http_upstream_server_t *us; | |
| 651 | 4229 |
| 4230 if (uscf->servers == NULL) { | |
| 884 | 4231 uscf->servers = ngx_array_create(cf->pool, 4, |
| 4232 sizeof(ngx_http_upstream_server_t)); | |
| 651 | 4233 if (uscf->servers == NULL) { |
| 4234 return NGX_CONF_ERROR; | |
| 4235 } | |
| 4236 } | |
| 4237 | |
| 884 | 4238 us = ngx_array_push(uscf->servers); |
| 4239 if (us == NULL) { | |
| 651 | 4240 return NGX_CONF_ERROR; |
| 4241 } | |
| 4242 | |
| 884 | 4243 ngx_memzero(us, sizeof(ngx_http_upstream_server_t)); |
| 4244 | |
| 651 | 4245 value = cf->args->elts; |
| 4246 | |
| 4247 ngx_memzero(&u, sizeof(ngx_url_t)); | |
| 4248 | |
| 4249 u.url = value[1]; | |
| 906 | 4250 u.default_port = 80; |
| 651 | 4251 |
|
1559
fe11e2a3946d
use pool instead of ngx_conf_t
Igor Sysoev <igor@sysoev.ru>
parents:
1558
diff
changeset
|
4252 if (ngx_parse_url(cf->pool, &u) != NGX_OK) { |
| 651 | 4253 if (u.err) { |
| 4254 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 4255 "%s in upstream \"%V\"", u.err, &u.url); | |
| 4256 } | |
| 4257 | |
| 4258 return NGX_CONF_ERROR; | |
| 4259 } | |
| 4260 | |
| 663 | 4261 weight = 1; |
| 884 | 4262 max_fails = 1; |
| 4263 fail_timeout = 10; | |
| 4264 | |
| 4265 for (i = 2; i < cf->args->nelts; i++) { | |
| 4266 | |
| 4267 if (ngx_strncmp(value[i].data, "weight=", 7) == 0) { | |
| 4268 | |
| 4269 if (!(uscf->flags & NGX_HTTP_UPSTREAM_WEIGHT)) { | |
| 4270 goto invalid; | |
| 4271 } | |
| 4272 | |
| 4273 weight = ngx_atoi(&value[i].data[7], value[i].len - 7); | |
| 663 | 4274 |
| 4275 if (weight == NGX_ERROR || weight == 0) { | |
| 4276 goto invalid; | |
| 4277 } | |
| 4278 | |
| 884 | 4279 continue; |
| 4280 } | |
| 4281 | |
| 4282 if (ngx_strncmp(value[i].data, "max_fails=", 10) == 0) { | |
| 4283 | |
| 4284 if (!(uscf->flags & NGX_HTTP_UPSTREAM_MAX_FAILS)) { | |
| 4285 goto invalid; | |
| 4286 } | |
| 4287 | |
| 4288 max_fails = ngx_atoi(&value[i].data[10], value[i].len - 10); | |
| 4289 | |
| 4290 if (max_fails == NGX_ERROR) { | |
| 4291 goto invalid; | |
| 4292 } | |
| 4293 | |
| 4294 continue; | |
| 663 | 4295 } |
| 884 | 4296 |
| 4297 if (ngx_strncmp(value[i].data, "fail_timeout=", 13) == 0) { | |
| 4298 | |
| 4299 if (!(uscf->flags & NGX_HTTP_UPSTREAM_FAIL_TIMEOUT)) { | |
| 4300 goto invalid; | |
| 4301 } | |
| 4302 | |
| 4303 s.len = value[i].len - 13; | |
| 4304 s.data = &value[i].data[13]; | |
| 4305 | |
| 4306 fail_timeout = ngx_parse_time(&s, 1); | |
| 4307 | |
| 4474 | 4308 if (fail_timeout == (time_t) NGX_ERROR) { |
| 884 | 4309 goto invalid; |
| 4310 } | |
| 4311 | |
| 4312 continue; | |
| 4313 } | |
| 4314 | |
| 1378 | 4315 if (ngx_strncmp(value[i].data, "backup", 6) == 0) { |
| 4316 | |
| 4317 if (!(uscf->flags & NGX_HTTP_UPSTREAM_BACKUP)) { | |
| 4318 goto invalid; | |
| 4319 } | |
| 4320 | |
| 4321 us->backup = 1; | |
| 4322 | |
| 4323 continue; | |
| 4324 } | |
| 4325 | |
| 884 | 4326 if (ngx_strncmp(value[i].data, "down", 4) == 0) { |
| 4327 | |
| 4328 if (!(uscf->flags & NGX_HTTP_UPSTREAM_DOWN)) { | |
| 4329 goto invalid; | |
| 4330 } | |
| 4331 | |
| 4332 us->down = 1; | |
| 4333 | |
| 4334 continue; | |
| 4335 } | |
| 4336 | |
| 4337 goto invalid; | |
| 663 | 4338 } |
| 4339 | |
| 884 | 4340 us->addrs = u.addrs; |
| 4341 us->naddrs = u.naddrs; | |
| 4342 us->weight = weight; | |
| 4343 us->max_fails = max_fails; | |
| 4344 us->fail_timeout = fail_timeout; | |
| 651 | 4345 |
| 4346 return NGX_CONF_OK; | |
| 663 | 4347 |
| 4348 invalid: | |
| 4349 | |
| 884 | 4350 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 4351 "invalid parameter \"%V\"", &value[i]); | |
| 663 | 4352 |
| 4353 return NGX_CONF_ERROR; | |
| 651 | 4354 } |
| 4355 | |
| 4356 | |
| 4357 ngx_http_upstream_srv_conf_t * | |
| 884 | 4358 ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags) |
| 651 | 4359 { |
| 4360 ngx_uint_t i; | |
| 884 | 4361 ngx_http_upstream_server_t *us; |
| 651 | 4362 ngx_http_upstream_srv_conf_t *uscf, **uscfp; |
| 4363 ngx_http_upstream_main_conf_t *umcf; | |
| 4364 | |
| 884 | 4365 if (!(flags & NGX_HTTP_UPSTREAM_CREATE)) { |
| 4366 | |
|
1559
fe11e2a3946d
use pool instead of ngx_conf_t
Igor Sysoev <igor@sysoev.ru>
parents:
1558
diff
changeset
|
4367 if (ngx_parse_url(cf->pool, u) != NGX_OK) { |
| 651 | 4368 if (u->err) { |
| 4369 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 4370 "%s in upstream \"%V\"", u->err, &u->url); | |
| 4371 } | |
| 4372 | |
| 4373 return NULL; | |
| 4374 } | |
| 4375 } | |
| 4376 | |
| 4377 umcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_upstream_module); | |
| 4378 | |
| 4379 uscfp = umcf->upstreams.elts; | |
| 4380 | |
| 4381 for (i = 0; i < umcf->upstreams.nelts; i++) { | |
| 906 | 4382 |
| 4383 if (uscfp[i]->host.len != u->host.len | |
| 884 | 4384 || ngx_strncasecmp(uscfp[i]->host.data, u->host.data, u->host.len) |
| 4385 != 0) | |
| 4386 { | |
| 651 | 4387 continue; |
| 4388 } | |
| 4389 | |
| 884 | 4390 if ((flags & NGX_HTTP_UPSTREAM_CREATE) |
| 4391 && (uscfp[i]->flags & NGX_HTTP_UPSTREAM_CREATE)) | |
| 651 | 4392 { |
| 884 | 4393 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 4394 "duplicate upstream \"%V\"", &u->host); | |
| 4395 return NULL; | |
| 651 | 4396 } |
| 884 | 4397 |
|
5005
c9059bd5445b
Fixed "proxy_pass" with IP address and no port (ticket #276).
Ruslan Ermilov <ru@nginx.com>
parents:
4990
diff
changeset
|
4398 if ((uscfp[i]->flags & NGX_HTTP_UPSTREAM_CREATE) && !u->no_port) { |
| 884 | 4399 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, |
| 906 | 4400 "upstream \"%V\" may not have port %d", |
| 4401 &u->host, u->port); | |
| 4402 return NULL; | |
| 4403 } | |
| 4404 | |
|
5005
c9059bd5445b
Fixed "proxy_pass" with IP address and no port (ticket #276).
Ruslan Ermilov <ru@nginx.com>
parents:
4990
diff
changeset
|
4405 if ((flags & NGX_HTTP_UPSTREAM_CREATE) && !uscfp[i]->no_port) { |
| 906 | 4406 ngx_log_error(NGX_LOG_WARN, cf->log, 0, |
| 4407 "upstream \"%V\" may not have port %d in %s:%ui", | |
| 4408 &u->host, uscfp[i]->port, | |
|
1489
56f1ea5baabb
u_char* is enough to keep file name
Igor Sysoev <igor@sysoev.ru>
parents:
1469
diff
changeset
|
4409 uscfp[i]->file_name, uscfp[i]->line); |
| 906 | 4410 return NULL; |
| 4411 } | |
| 4412 | |
|
5005
c9059bd5445b
Fixed "proxy_pass" with IP address and no port (ticket #276).
Ruslan Ermilov <ru@nginx.com>
parents:
4990
diff
changeset
|
4413 if (uscfp[i]->port && u->port |
|
c9059bd5445b
Fixed "proxy_pass" with IP address and no port (ticket #276).
Ruslan Ermilov <ru@nginx.com>
parents:
4990
diff
changeset
|
4414 && uscfp[i]->port != u->port) |
|
c9059bd5445b
Fixed "proxy_pass" with IP address and no port (ticket #276).
Ruslan Ermilov <ru@nginx.com>
parents:
4990
diff
changeset
|
4415 { |
| 906 | 4416 continue; |
| 884 | 4417 } |
| 4418 | |
| 1340 | 4419 if (uscfp[i]->default_port && u->default_port |
| 4420 && uscfp[i]->default_port != u->default_port) | |
| 4421 { | |
| 4422 continue; | |
| 4423 } | |
| 4424 | |
|
4152
65c1c241d70e
Better handling of late upstream creation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4151
diff
changeset
|
4425 if (flags & NGX_HTTP_UPSTREAM_CREATE) { |
|
65c1c241d70e
Better handling of late upstream creation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4151
diff
changeset
|
4426 uscfp[i]->flags = flags; |
|
65c1c241d70e
Better handling of late upstream creation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4151
diff
changeset
|
4427 } |
|
65c1c241d70e
Better handling of late upstream creation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4151
diff
changeset
|
4428 |
| 884 | 4429 return uscfp[i]; |
| 651 | 4430 } |
| 4431 | |
| 4432 uscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_srv_conf_t)); | |
| 4433 if (uscf == NULL) { | |
| 4434 return NULL; | |
| 4435 } | |
| 4436 | |
| 884 | 4437 uscf->flags = flags; |
| 651 | 4438 uscf->host = u->host; |
|
1489
56f1ea5baabb
u_char* is enough to keep file name
Igor Sysoev <igor@sysoev.ru>
parents:
1469
diff
changeset
|
4439 uscf->file_name = cf->conf_file->file.name.data; |
| 651 | 4440 uscf->line = cf->conf_file->line; |
| 906 | 4441 uscf->port = u->port; |
| 4442 uscf->default_port = u->default_port; | |
|
5005
c9059bd5445b
Fixed "proxy_pass" with IP address and no port (ticket #276).
Ruslan Ermilov <ru@nginx.com>
parents:
4990
diff
changeset
|
4443 uscf->no_port = u->no_port; |
| 884 | 4444 |
| 4445 if (u->naddrs == 1) { | |
| 4446 uscf->servers = ngx_array_create(cf->pool, 1, | |
| 4447 sizeof(ngx_http_upstream_server_t)); | |
| 4448 if (uscf->servers == NULL) { | |
|
4765
c48902a053d6
ngx_http_upstream_add() should return NULL if an error occurs.
Ruslan Ermilov <ru@nginx.com>
parents:
4650
diff
changeset
|
4449 return NULL; |
| 884 | 4450 } |
| 4451 | |
| 4452 us = ngx_array_push(uscf->servers); | |
| 4453 if (us == NULL) { | |
|
4765
c48902a053d6
ngx_http_upstream_add() should return NULL if an error occurs.
Ruslan Ermilov <ru@nginx.com>
parents:
4650
diff
changeset
|
4454 return NULL; |
| 884 | 4455 } |
| 4456 | |
| 4457 ngx_memzero(us, sizeof(ngx_http_upstream_server_t)); | |
| 4458 | |
| 4459 us->addrs = u->addrs; | |
|
4766
284cb8fb0741
Slight optimization in ngx_http_upstream_add(): replaced an expression
Ruslan Ermilov <ru@nginx.com>
parents:
4765
diff
changeset
|
4460 us->naddrs = 1; |
| 884 | 4461 } |
| 651 | 4462 |
| 4463 uscfp = ngx_array_push(&umcf->upstreams); | |
| 4464 if (uscfp == NULL) { | |
| 4465 return NULL; | |
| 4466 } | |
| 4467 | |
| 4468 *uscfp = uscf; | |
| 4469 | |
| 4470 return uscf; | |
| 4471 } | |
| 4472 | |
| 4473 | |
|
3271
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
4474 char * |
| 3399 | 4475 ngx_http_upstream_bind_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, |
|
3271
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
4476 void *conf) |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
4477 { |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
4478 char *p = conf; |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
4479 |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4480 ngx_int_t rc; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4481 ngx_str_t *value; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4482 ngx_http_complex_value_t cv; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4483 ngx_http_upstream_local_t **plocal, *local; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4484 ngx_http_compile_complex_value_t ccv; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4485 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4486 plocal = (ngx_http_upstream_local_t **) (p + cmd->offset); |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4487 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4488 if (*plocal != NGX_CONF_UNSET_PTR) { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4489 return "is duplicate"; |
|
3271
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
4490 } |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
4491 |
|
3272
98f49b2bcae8
change ngx_parse_addr() interface
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
4492 value = cf->args->elts; |
|
98f49b2bcae8
change ngx_parse_addr() interface
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
4493 |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4494 if (ngx_strcmp(value[1].data, "off") == 0) { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4495 *plocal = NULL; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4496 return NGX_CONF_OK; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4497 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4498 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4499 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4500 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4501 ccv.cf = cf; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4502 ccv.value = &value[1]; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4503 ccv.complex_value = &cv; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4504 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4505 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4506 return NGX_CONF_ERROR; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4507 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4508 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4509 local = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_local_t)); |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4510 if (local == NULL) { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4511 return NGX_CONF_ERROR; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4512 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4513 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4514 *plocal = local; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4515 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4516 if (cv.lengths) { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4517 local->value = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t)); |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4518 if (local->value == NULL) { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4519 return NGX_CONF_ERROR; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4520 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4521 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4522 *local->value = cv; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4523 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4524 return NGX_CONF_OK; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4525 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4526 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4527 local->addr = ngx_palloc(cf->pool, sizeof(ngx_addr_t)); |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4528 if (local->addr == NULL) { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4529 return NGX_CONF_ERROR; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4530 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4531 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4532 rc = ngx_parse_addr(cf->pool, local->addr, value[1].data, value[1].len); |
|
3272
98f49b2bcae8
change ngx_parse_addr() interface
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
4533 |
|
98f49b2bcae8
change ngx_parse_addr() interface
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
4534 switch (rc) { |
|
98f49b2bcae8
change ngx_parse_addr() interface
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
4535 case NGX_OK: |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4536 local->addr->name = value[1]; |
|
3272
98f49b2bcae8
change ngx_parse_addr() interface
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
4537 return NGX_CONF_OK; |
|
98f49b2bcae8
change ngx_parse_addr() interface
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
4538 |
|
98f49b2bcae8
change ngx_parse_addr() interface
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
4539 case NGX_DECLINED: |
|
98f49b2bcae8
change ngx_parse_addr() interface
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
4540 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
98f49b2bcae8
change ngx_parse_addr() interface
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
4541 "invalid address \"%V\"", &value[1]); |
|
4546
4988fa232629
For the sake of case/switch code readability, 'fall through'
Maxim Konovalov <maxim@nginx.com>
parents:
4499
diff
changeset
|
4542 /* fall through */ |
|
4988fa232629
For the sake of case/switch code readability, 'fall through'
Maxim Konovalov <maxim@nginx.com>
parents:
4499
diff
changeset
|
4543 |
|
3272
98f49b2bcae8
change ngx_parse_addr() interface
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
4544 default: |
|
98f49b2bcae8
change ngx_parse_addr() interface
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
4545 return NGX_CONF_ERROR; |
|
98f49b2bcae8
change ngx_parse_addr() interface
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
4546 } |
|
3271
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
4547 } |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
4548 |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
4549 |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4550 static ngx_addr_t * |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4551 ngx_http_upstream_get_local(ngx_http_request_t *r, |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4552 ngx_http_upstream_local_t *local) |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4553 { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4554 ngx_int_t rc; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4555 ngx_str_t val; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4556 ngx_addr_t *addr; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4557 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4558 if (local == NULL) { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4559 return NULL; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4560 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4561 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4562 if (local->value == NULL) { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4563 return local->addr; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4564 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4565 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4566 if (ngx_http_complex_value(r, local->value, &val) != NGX_OK) { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4567 return NULL; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4568 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4569 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4570 if (val.len == 0) { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4571 return NULL; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4572 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4573 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4574 addr = ngx_palloc(r->pool, sizeof(ngx_addr_t)); |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4575 if (addr == NULL) { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4576 return NULL; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4577 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4578 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4579 rc = ngx_parse_addr(r->pool, addr, val.data, val.len); |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4580 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4581 switch (rc) { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4582 case NGX_OK: |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4583 addr->name = val; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4584 return addr; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4585 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4586 case NGX_DECLINED: |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4587 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4588 "invalid local address \"%V\"", &val); |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4589 /* fall through */ |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4590 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4591 default: |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4592 return NULL; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4593 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4594 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4595 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
4596 |
|
4328
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4597 char * |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4598 ngx_http_upstream_param_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4599 void *conf) |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4600 { |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4601 char *p = conf; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4602 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4603 ngx_str_t *value; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4604 ngx_array_t **a; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4605 ngx_http_upstream_param_t *param; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4606 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4607 a = (ngx_array_t **) (p + cmd->offset); |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4608 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4609 if (*a == NULL) { |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4610 *a = ngx_array_create(cf->pool, 4, sizeof(ngx_http_upstream_param_t)); |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4611 if (*a == NULL) { |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4612 return NGX_CONF_ERROR; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4613 } |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4614 } |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4615 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4616 param = ngx_array_push(*a); |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4617 if (param == NULL) { |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4618 return NGX_CONF_ERROR; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4619 } |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4620 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4621 value = cf->args->elts; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4622 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4623 param->key = value[1]; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4624 param->value = value[2]; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4625 param->skip_empty = 0; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4626 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4627 if (cf->args->nelts == 4) { |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4628 if (ngx_strcmp(value[3].data, "if_not_empty") != 0) { |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4629 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4630 "invalid parameter \"%V\"", &value[3]); |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4631 return NGX_CONF_ERROR; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4632 } |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4633 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4634 param->skip_empty = 1; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4635 } |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4636 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4637 return NGX_CONF_OK; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4638 } |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4639 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
4640 |
|
1701
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4641 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
|
4642 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
|
4643 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
|
4644 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
|
4645 { |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4646 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
|
4647 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
|
4648 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
|
4649 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
|
4650 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4651 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
|
4652 && 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
|
4653 { |
|
4769
f88555d76886
Upstream: hide_headers/pass_headers inheritance fix.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4766
diff
changeset
|
4654 conf->hide_headers = prev->hide_headers; |
|
f88555d76886
Upstream: hide_headers/pass_headers inheritance fix.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4766
diff
changeset
|
4655 conf->pass_headers = prev->pass_headers; |
|
f88555d76886
Upstream: hide_headers/pass_headers inheritance fix.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4766
diff
changeset
|
4656 |
|
1701
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4657 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
|
4658 |
|
2929
37b7cd336fdf
inherit proxy_set_header, proxy_hide_header, and fastcgi_hide_header
Igor Sysoev <igor@sysoev.ru>
parents:
2927
diff
changeset
|
4659 if (conf->hide_headers_hash.buckets |
|
2949
fe484c0be7c0
fix building --without-http-cache, broken in r2930
Igor Sysoev <igor@sysoev.ru>
parents:
2929
diff
changeset
|
4660 #if (NGX_HTTP_CACHE) |
|
fe484c0be7c0
fix building --without-http-cache, broken in r2930
Igor Sysoev <igor@sysoev.ru>
parents:
2929
diff
changeset
|
4661 && ((conf->cache == NULL) == (prev->cache == NULL)) |
|
fe484c0be7c0
fix building --without-http-cache, broken in r2930
Igor Sysoev <igor@sysoev.ru>
parents:
2929
diff
changeset
|
4662 #endif |
|
fe484c0be7c0
fix building --without-http-cache, broken in r2930
Igor Sysoev <igor@sysoev.ru>
parents:
2929
diff
changeset
|
4663 ) |
|
2929
37b7cd336fdf
inherit proxy_set_header, proxy_hide_header, and fastcgi_hide_header
Igor Sysoev <igor@sysoev.ru>
parents:
2927
diff
changeset
|
4664 { |
|
1701
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4665 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
|
4666 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4667 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4668 } else { |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4669 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
|
4670 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
|
4671 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4672 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4673 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
|
4674 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
|
4675 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4676 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4677 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4678 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
|
4679 != NGX_OK) |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4680 { |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4681 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
|
4682 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4683 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4684 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
|
4685 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
|
4686 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
|
4687 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
|
4688 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4689 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4690 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
|
4691 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
|
4692 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
|
4693 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4694 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4695 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
|
4696 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4697 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
|
4698 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4699 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
|
4700 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4701 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
|
4702 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4703 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
|
4704 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
|
4705 goto exist; |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4706 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4707 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4708 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4709 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
|
4710 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
|
4711 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
|
4712 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4713 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4714 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
|
4715 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
|
4716 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
|
4717 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4718 exist: |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4719 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4720 continue; |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4721 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4722 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4723 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4724 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
|
4725 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4726 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
|
4727 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
|
4728 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4729 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
|
4730 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
|
4731 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4732 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
|
4733 continue; |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4734 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4735 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4736 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
|
4737 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
|
4738 break; |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4739 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4740 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4741 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4742 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4743 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4744 hash->hash = &conf->hide_headers_hash; |
|
1706
9242e21d2f8d
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1705
diff
changeset
|
4745 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
|
4746 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
|
4747 hash->temp_pool = NULL; |
|
1706
9242e21d2f8d
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1705
diff
changeset
|
4748 |
|
1701
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4749 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
|
4750 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4751 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
4752 |
| 509 | 4753 static void * |
| 4754 ngx_http_upstream_create_main_conf(ngx_conf_t *cf) | |
| 4755 { | |
| 4756 ngx_http_upstream_main_conf_t *umcf; | |
| 4757 | |
| 4758 umcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_main_conf_t)); | |
| 4759 if (umcf == NULL) { | |
| 4760 return NULL; | |
| 4761 } | |
| 4762 | |
| 651 | 4763 if (ngx_array_init(&umcf->upstreams, cf->pool, 4, |
| 4764 sizeof(ngx_http_upstream_srv_conf_t *)) | |
| 4765 != NGX_OK) | |
| 4766 { | |
|
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2882
diff
changeset
|
4767 return NULL; |
| 651 | 4768 } |
| 4769 | |
| 509 | 4770 return umcf; |
| 4771 } | |
| 4772 | |
| 4773 | |
| 4774 static char * | |
| 651 | 4775 ngx_http_upstream_init_main_conf(ngx_conf_t *cf, void *conf) |
| 509 | 4776 { |
| 4777 ngx_http_upstream_main_conf_t *umcf = conf; | |
| 4778 | |
| 651 | 4779 ngx_uint_t i; |
| 4780 ngx_array_t headers_in; | |
| 4781 ngx_hash_key_t *hk; | |
| 4782 ngx_hash_init_t hash; | |
| 884 | 4783 ngx_http_upstream_init_pt init; |
| 651 | 4784 ngx_http_upstream_header_t *header; |
| 4785 ngx_http_upstream_srv_conf_t **uscfp; | |
| 4786 | |
| 4787 uscfp = umcf->upstreams.elts; | |
| 4788 | |
| 4789 for (i = 0; i < umcf->upstreams.nelts; i++) { | |
| 884 | 4790 |
| 4791 init = uscfp[i]->peer.init_upstream ? uscfp[i]->peer.init_upstream: | |
| 4792 ngx_http_upstream_init_round_robin; | |
| 4793 | |
| 4794 if (init(cf, uscfp[i]) != NGX_OK) { | |
| 651 | 4795 return NGX_CONF_ERROR; |
| 4796 } | |
| 4797 } | |
| 649 | 4798 |
| 663 | 4799 |
| 884 | 4800 /* upstream_headers_in_hash */ |
| 4801 | |
| 649 | 4802 if (ngx_array_init(&headers_in, cf->temp_pool, 32, sizeof(ngx_hash_key_t)) |
| 4803 != NGX_OK) | |
| 509 | 4804 { |
| 4805 return NGX_CONF_ERROR; | |
| 4806 } | |
| 4807 | |
| 649 | 4808 for (header = ngx_http_upstream_headers_in; header->name.len; header++) { |
| 4809 hk = ngx_array_push(&headers_in); | |
| 4810 if (hk == NULL) { | |
| 4811 return NGX_CONF_ERROR; | |
| 4812 } | |
| 4813 | |
| 4814 hk->key = header->name; | |
| 4815 hk->key_hash = ngx_hash_key_lc(header->name.data, header->name.len); | |
| 4816 hk->value = header; | |
| 4817 } | |
| 4818 | |
| 4819 hash.hash = &umcf->headers_in_hash; | |
| 4820 hash.key = ngx_hash_key_lc; | |
| 4821 hash.max_size = 512; | |
|
751
bae59a740c40
align hash bucket size to cache line
Igor Sysoev <igor@sysoev.ru>
parents:
750
diff
changeset
|
4822 hash.bucket_size = ngx_align(64, ngx_cacheline_size); |
| 649 | 4823 hash.name = "upstream_headers_in_hash"; |
| 4824 hash.pool = cf->pool; | |
| 4825 hash.temp_pool = NULL; | |
| 4826 | |
| 4827 if (ngx_hash_init(&hash, headers_in.elts, headers_in.nelts) != NGX_OK) { | |
| 4828 return NGX_CONF_ERROR; | |
| 4829 } | |
| 509 | 4830 |
| 4831 return NGX_CONF_OK; | |
| 4832 } |