Mercurial > hg > nginx
annotate src/http/ngx_http_upstream.c @ 8042:c7e25324be11
Upstream: handling of certificates specified as an empty string.
Now, if the directive is given an empty string, such configuration cancels
loading of certificates, in particular, if they would be otherwise inherited
from the previous level. This restores previous behaviour, before variables
support in certificates was introduced (3ab8e1e2f0f7).
| author | Sergey Kandaurov <pluknet@nginx.com> |
|---|---|
| date | Tue, 07 Jun 2022 20:08:57 +0400 |
| parents | 0784ab86ad08 |
| children | 8d0753760546 |
| 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); |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
16 static ngx_int_t ngx_http_upstream_cache_get(ngx_http_request_t *r, |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
17 ngx_http_upstream_t *u, ngx_http_file_cache_t **cache); |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
18 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
|
19 ngx_http_upstream_t *u); |
|
6906
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
20 static ngx_int_t ngx_http_upstream_cache_background_update( |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
21 ngx_http_request_t *r, ngx_http_upstream_t *u); |
|
6793
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
22 static ngx_int_t ngx_http_upstream_cache_check_range(ngx_http_request_t *r, |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
23 ngx_http_upstream_t *u); |
| 2952 | 24 static ngx_int_t ngx_http_upstream_cache_status(ngx_http_request_t *r, |
| 25 ngx_http_variable_value_t *v, uintptr_t data); | |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
26 static ngx_int_t ngx_http_upstream_cache_last_modified(ngx_http_request_t *r, |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
27 ngx_http_variable_value_t *v, uintptr_t data); |
|
5738
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
28 static ngx_int_t ngx_http_upstream_cache_etag(ngx_http_request_t *r, |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
29 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
|
30 #endif |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
31 |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
32 static void ngx_http_upstream_init_request(ngx_http_request_t *r); |
| 1658 | 33 static void ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx); |
| 509 | 34 static void ngx_http_upstream_rd_check_broken_connection(ngx_http_request_t *r); |
| 35 static void ngx_http_upstream_wr_check_broken_connection(ngx_http_request_t *r); | |
| 36 static void ngx_http_upstream_check_broken_connection(ngx_http_request_t *r, | |
| 37 ngx_event_t *ev); | |
| 479 | 38 static void ngx_http_upstream_connect(ngx_http_request_t *r, |
| 487 | 39 ngx_http_upstream_t *u); |
| 509 | 40 static ngx_int_t ngx_http_upstream_reinit(ngx_http_request_t *r, |
| 487 | 41 ngx_http_upstream_t *u); |
| 479 | 42 static void ngx_http_upstream_send_request(ngx_http_request_t *r, |
|
6050
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
43 ngx_http_upstream_t *u, ngx_uint_t do_write); |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
44 static ngx_int_t ngx_http_upstream_send_request_body(ngx_http_request_t *r, |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
45 ngx_http_upstream_t *u, ngx_uint_t do_write); |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
46 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
|
47 ngx_http_upstream_t *u); |
|
6050
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
48 static void ngx_http_upstream_read_request_handler(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
|
49 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
|
50 ngx_http_upstream_t *u); |
|
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
51 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
|
52 ngx_http_upstream_t *u); |
|
2267
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
53 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
|
54 ngx_http_upstream_t *u); |
|
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
55 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
|
56 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
|
57 ngx_http_upstream_t *u); |
|
7230
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
58 static ngx_int_t ngx_http_upstream_process_trailers(ngx_http_request_t *r, |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
59 ngx_http_upstream_t *u); |
| 479 | 60 static void ngx_http_upstream_send_response(ngx_http_request_t *r, |
| 487 | 61 ngx_http_upstream_t *u); |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
62 static void ngx_http_upstream_upgrade(ngx_http_request_t *r, |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
63 ngx_http_upstream_t *u); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
64 static void ngx_http_upstream_upgraded_read_downstream(ngx_http_request_t *r); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
65 static void ngx_http_upstream_upgraded_write_downstream(ngx_http_request_t *r); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
66 static void ngx_http_upstream_upgraded_read_upstream(ngx_http_request_t *r, |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
67 ngx_http_upstream_t *u); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
68 static void ngx_http_upstream_upgraded_write_upstream(ngx_http_request_t *r, |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
69 ngx_http_upstream_t *u); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
70 static void ngx_http_upstream_process_upgraded(ngx_http_request_t *r, |
|
5073
52eb762c68a9
Proxy: fixed do_write handling in previous commit.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5072
diff
changeset
|
71 ngx_uint_t from_upstream, ngx_uint_t do_write); |
| 581 | 72 static void |
| 73 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
|
74 static void |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
75 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
|
76 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
|
77 static void |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
78 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
|
79 ngx_uint_t do_write); |
|
6443
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
80 #if (NGX_THREADS) |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
81 static ngx_int_t ngx_http_upstream_thread_handler(ngx_thread_task_t *task, |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
82 ngx_file_t *file); |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
83 static void ngx_http_upstream_thread_event_handler(ngx_event_t *ev); |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
84 #endif |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
85 static ngx_int_t ngx_http_upstream_output_filter(void *data, |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
86 ngx_chain_t *chain); |
| 509 | 87 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
|
88 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
|
89 ngx_http_upstream_t *u); |
|
5995
5f179f344096
Upstream: upstream argument in ngx_http_upstream_process_request().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5994
diff
changeset
|
90 static void ngx_http_upstream_process_request(ngx_http_request_t *r, |
|
5f179f344096
Upstream: upstream argument in ngx_http_upstream_process_request().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5994
diff
changeset
|
91 ngx_http_upstream_t *u); |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
92 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
|
93 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
|
94 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
|
95 ngx_http_upstream_t *u); |
| 479 | 96 static void ngx_http_upstream_next(ngx_http_request_t *r, |
| 487 | 97 ngx_http_upstream_t *u, ngx_uint_t ft_type); |
| 569 | 98 static void ngx_http_upstream_cleanup(void *data); |
| 479 | 99 static void ngx_http_upstream_finalize_request(ngx_http_request_t *r, |
| 487 | 100 ngx_http_upstream_t *u, ngx_int_t rc); |
| 479 | 101 |
| 509 | 102 static ngx_int_t ngx_http_upstream_process_header_line(ngx_http_request_t *r, |
| 103 ngx_table_elt_t *h, ngx_uint_t offset); | |
|
8034
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
104 static ngx_int_t |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
105 ngx_http_upstream_process_multi_header_lines(ngx_http_request_t *r, |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
106 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
|
107 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
|
108 ngx_table_elt_t *h, ngx_uint_t offset); |
|
5732
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
109 static ngx_int_t ngx_http_upstream_process_last_modified(ngx_http_request_t *r, |
|
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
110 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
|
111 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
|
112 ngx_table_elt_t *h, ngx_uint_t offset); |
| 509 | 113 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
|
114 ngx_http_upstream_process_cache_control(ngx_http_request_t *r, |
| 509 | 115 ngx_table_elt_t *h, ngx_uint_t offset); |
| 116 static ngx_int_t ngx_http_upstream_ignore_header_line(ngx_http_request_t *r, | |
| 117 ngx_table_elt_t *h, ngx_uint_t offset); | |
| 2666 | 118 static ngx_int_t ngx_http_upstream_process_expires(ngx_http_request_t *r, |
| 119 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
|
120 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
|
121 ngx_table_elt_t *h, ngx_uint_t offset); |
| 527 | 122 static ngx_int_t ngx_http_upstream_process_limit_rate(ngx_http_request_t *r, |
| 123 ngx_table_elt_t *h, ngx_uint_t offset); | |
| 649 | 124 static ngx_int_t ngx_http_upstream_process_buffering(ngx_http_request_t *r, |
| 509 | 125 ngx_table_elt_t *h, ngx_uint_t offset); |
| 657 | 126 static ngx_int_t ngx_http_upstream_process_charset(ngx_http_request_t *r, |
| 127 ngx_table_elt_t *h, ngx_uint_t offset); | |
|
4124
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
128 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
|
129 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
|
130 static ngx_int_t |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
131 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
|
132 ngx_table_elt_t *h, ngx_uint_t offset); |
|
5877
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
133 static ngx_int_t ngx_http_upstream_process_vary(ngx_http_request_t *r, |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
134 ngx_table_elt_t *h, ngx_uint_t offset); |
| 649 | 135 static ngx_int_t ngx_http_upstream_copy_header_line(ngx_http_request_t *r, |
| 509 | 136 ngx_table_elt_t *h, ngx_uint_t offset); |
| 137 static ngx_int_t | |
| 138 ngx_http_upstream_copy_multi_header_lines(ngx_http_request_t *r, | |
| 139 ngx_table_elt_t *h, ngx_uint_t offset); | |
| 140 static ngx_int_t ngx_http_upstream_copy_content_type(ngx_http_request_t *r, | |
| 141 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
|
142 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
|
143 ngx_table_elt_t *h, ngx_uint_t offset); |
| 509 | 144 static ngx_int_t ngx_http_upstream_rewrite_location(ngx_http_request_t *r, |
| 145 ngx_table_elt_t *h, ngx_uint_t offset); | |
| 146 static ngx_int_t ngx_http_upstream_rewrite_refresh(ngx_http_request_t *r, | |
| 147 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
|
148 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
|
149 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
|
150 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
|
151 ngx_table_elt_t *h, ngx_uint_t offset); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
152 |
| 573 | 153 static ngx_int_t ngx_http_upstream_add_variables(ngx_conf_t *cf); |
| 1181 | 154 static ngx_int_t ngx_http_upstream_addr_variable(ngx_http_request_t *r, |
| 155 ngx_http_variable_value_t *v, uintptr_t data); | |
| 573 | 156 static ngx_int_t ngx_http_upstream_status_variable(ngx_http_request_t *r, |
| 157 ngx_http_variable_value_t *v, uintptr_t data); | |
| 158 static ngx_int_t ngx_http_upstream_response_time_variable(ngx_http_request_t *r, | |
| 159 ngx_http_variable_value_t *v, uintptr_t data); | |
| 2402 | 160 static ngx_int_t ngx_http_upstream_response_length_variable( |
| 161 ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data); | |
|
6899
d2b2ff157da5
Variables: generic prefix variables.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6876
diff
changeset
|
162 static ngx_int_t ngx_http_upstream_header_variable(ngx_http_request_t *r, |
|
d2b2ff157da5
Variables: generic prefix variables.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6876
diff
changeset
|
163 ngx_http_variable_value_t *v, uintptr_t data); |
|
7230
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
164 static ngx_int_t ngx_http_upstream_trailer_variable(ngx_http_request_t *r, |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
165 ngx_http_variable_value_t *v, uintptr_t data); |
|
6899
d2b2ff157da5
Variables: generic prefix variables.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6876
diff
changeset
|
166 static ngx_int_t ngx_http_upstream_cookie_variable(ngx_http_request_t *r, |
|
d2b2ff157da5
Variables: generic prefix variables.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6876
diff
changeset
|
167 ngx_http_variable_value_t *v, uintptr_t data); |
| 573 | 168 |
| 651 | 169 static char *ngx_http_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy); |
| 170 static char *ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, | |
| 171 void *conf); | |
| 172 | |
|
6528
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
173 static ngx_int_t ngx_http_upstream_set_local(ngx_http_request_t *r, |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
174 ngx_http_upstream_t *u, ngx_http_upstream_local_t *local); |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
175 |
| 509 | 176 static void *ngx_http_upstream_create_main_conf(ngx_conf_t *cf); |
| 651 | 177 static char *ngx_http_upstream_init_main_conf(ngx_conf_t *cf, void *conf); |
| 509 | 178 |
| 577 | 179 #if (NGX_HTTP_SSL) |
| 591 | 180 static void ngx_http_upstream_ssl_init_connection(ngx_http_request_t *, |
| 181 ngx_http_upstream_t *u, ngx_connection_t *c); | |
|
7042
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
182 static void ngx_http_upstream_ssl_handshake_handler(ngx_connection_t *c); |
|
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
183 static void ngx_http_upstream_ssl_handshake(ngx_http_request_t *, |
|
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
184 ngx_http_upstream_t *u, ngx_connection_t *c); |
|
7320
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
185 static void ngx_http_upstream_ssl_save_session(ngx_connection_t *c); |
|
5660
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
186 static ngx_int_t ngx_http_upstream_ssl_name(ngx_http_request_t *r, |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
187 ngx_http_upstream_t *u, ngx_connection_t *c); |
|
7833
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
188 static ngx_int_t ngx_http_upstream_ssl_certificate(ngx_http_request_t *r, |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
189 ngx_http_upstream_t *u, ngx_connection_t *c); |
| 577 | 190 #endif |
| 191 | |
| 509 | 192 |
|
6922
a72886067bbb
Added missing static specifiers.
Eran Kornblau <erankor@gmail.com>
parents:
6909
diff
changeset
|
193 static ngx_http_upstream_header_t ngx_http_upstream_headers_in[] = { |
| 509 | 194 |
| 195 { ngx_string("Status"), | |
| 196 ngx_http_upstream_process_header_line, | |
| 197 offsetof(ngx_http_upstream_headers_in_t, status), | |
| 649 | 198 ngx_http_upstream_copy_header_line, 0, 0 }, |
| 509 | 199 |
| 200 { ngx_string("Content-Type"), | |
| 201 ngx_http_upstream_process_header_line, | |
| 202 offsetof(ngx_http_upstream_headers_in_t, content_type), | |
| 673 | 203 ngx_http_upstream_copy_content_type, 0, 1 }, |
| 509 | 204 |
| 205 { ngx_string("Content-Length"), | |
|
5731
02674312be45
Upstream: removed unused offset to content_length.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5730
diff
changeset
|
206 ngx_http_upstream_process_content_length, 0, |
|
4117
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
207 ngx_http_upstream_ignore_header_line, 0, 0 }, |
| 509 | 208 |
| 209 { ngx_string("Date"), | |
| 210 ngx_http_upstream_process_header_line, | |
| 211 offsetof(ngx_http_upstream_headers_in_t, date), | |
| 649 | 212 ngx_http_upstream_copy_header_line, |
| 213 offsetof(ngx_http_headers_out_t, date), 0 }, | |
| 509 | 214 |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
215 { ngx_string("Last-Modified"), |
|
5732
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
216 ngx_http_upstream_process_last_modified, 0, |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
217 ngx_http_upstream_copy_last_modified, 0, 0 }, |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
218 |
| 3037 | 219 { ngx_string("ETag"), |
| 220 ngx_http_upstream_process_header_line, | |
| 221 offsetof(ngx_http_upstream_headers_in_t, etag), | |
| 222 ngx_http_upstream_copy_header_line, | |
| 223 offsetof(ngx_http_headers_out_t, etag), 0 }, | |
| 224 | |
| 509 | 225 { ngx_string("Server"), |
| 226 ngx_http_upstream_process_header_line, | |
| 227 offsetof(ngx_http_upstream_headers_in_t, server), | |
| 649 | 228 ngx_http_upstream_copy_header_line, |
| 229 offsetof(ngx_http_headers_out_t, server), 0 }, | |
| 509 | 230 |
| 529 | 231 { ngx_string("WWW-Authenticate"), |
|
8034
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
232 ngx_http_upstream_process_multi_header_lines, |
| 529 | 233 offsetof(ngx_http_upstream_headers_in_t, www_authenticate), |
| 234 ngx_http_upstream_copy_header_line, 0, 0 }, | |
| 235 | |
| 509 | 236 { ngx_string("Location"), |
|
2140
dce5ddef5af9
if upstream sent a location header without status use 302
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
237 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
|
238 offsetof(ngx_http_upstream_headers_in_t, location), |
| 515 | 239 ngx_http_upstream_rewrite_location, 0, 0 }, |
| 509 | 240 |
| 241 { ngx_string("Refresh"), | |
|
8034
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
242 ngx_http_upstream_process_header_line, |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
243 offsetof(ngx_http_upstream_headers_in_t, refresh), |
| 515 | 244 ngx_http_upstream_rewrite_refresh, 0, 0 }, |
| 245 | |
| 246 { ngx_string("Set-Cookie"), | |
|
5677
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
247 ngx_http_upstream_process_set_cookie, |
|
8024
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8023
diff
changeset
|
248 offsetof(ngx_http_upstream_headers_in_t, set_cookie), |
|
4464
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
249 ngx_http_upstream_rewrite_set_cookie, 0, 1 }, |
| 531 | 250 |
| 251 { ngx_string("Content-Disposition"), | |
| 252 ngx_http_upstream_ignore_header_line, 0, | |
| 253 ngx_http_upstream_copy_header_line, 0, 1 }, | |
| 509 | 254 |
| 255 { 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
|
256 ngx_http_upstream_process_cache_control, 0, |
| 509 | 257 ngx_http_upstream_copy_multi_header_lines, |
| 515 | 258 offsetof(ngx_http_headers_out_t, cache_control), 1 }, |
| 509 | 259 |
| 573 | 260 { ngx_string("Expires"), |
| 2666 | 261 ngx_http_upstream_process_expires, 0, |
| 573 | 262 ngx_http_upstream_copy_header_line, |
| 263 offsetof(ngx_http_headers_out_t, expires), 1 }, | |
| 264 | |
| 577 | 265 { ngx_string("Accept-Ranges"), |
|
8030
cdc2724858ca
Upstream: simplified Accept-Ranges handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8029
diff
changeset
|
266 ngx_http_upstream_ignore_header_line, 0, |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
267 ngx_http_upstream_copy_allow_ranges, |
| 577 | 268 offsetof(ngx_http_headers_out_t, accept_ranges), 1 }, |
| 269 | |
|
6316
f44de0d12143
Upstream: fill r->headers_out.content_range from upstream response.
Roman Arutyunyan <arut@nginx.com>
parents:
6313
diff
changeset
|
270 { ngx_string("Content-Range"), |
|
f44de0d12143
Upstream: fill r->headers_out.content_range from upstream response.
Roman Arutyunyan <arut@nginx.com>
parents:
6313
diff
changeset
|
271 ngx_http_upstream_ignore_header_line, 0, |
|
f44de0d12143
Upstream: fill r->headers_out.content_range from upstream response.
Roman Arutyunyan <arut@nginx.com>
parents:
6313
diff
changeset
|
272 ngx_http_upstream_copy_header_line, |
|
f44de0d12143
Upstream: fill r->headers_out.content_range from upstream response.
Roman Arutyunyan <arut@nginx.com>
parents:
6313
diff
changeset
|
273 offsetof(ngx_http_headers_out_t, content_range), 0 }, |
|
f44de0d12143
Upstream: fill r->headers_out.content_range from upstream response.
Roman Arutyunyan <arut@nginx.com>
parents:
6313
diff
changeset
|
274 |
| 509 | 275 { ngx_string("Connection"), |
|
4124
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
276 ngx_http_upstream_process_connection, 0, |
| 515 | 277 ngx_http_upstream_ignore_header_line, 0, 0 }, |
| 509 | 278 |
| 641 | 279 { ngx_string("Keep-Alive"), |
| 280 ngx_http_upstream_ignore_header_line, 0, | |
| 281 ngx_http_upstream_ignore_header_line, 0, 0 }, | |
| 282 | |
|
5877
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
283 { ngx_string("Vary"), |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
284 ngx_http_upstream_process_vary, 0, |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
285 ngx_http_upstream_copy_header_line, 0, 0 }, |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
286 |
|
7199
6ba68ad8b24c
Basic support of the Link response header.
Ruslan Ermilov <ru@nginx.com>
parents:
7194
diff
changeset
|
287 { ngx_string("Link"), |
|
6ba68ad8b24c
Basic support of the Link response header.
Ruslan Ermilov <ru@nginx.com>
parents:
7194
diff
changeset
|
288 ngx_http_upstream_ignore_header_line, 0, |
|
6ba68ad8b24c
Basic support of the Link response header.
Ruslan Ermilov <ru@nginx.com>
parents:
7194
diff
changeset
|
289 ngx_http_upstream_copy_multi_header_lines, |
|
6ba68ad8b24c
Basic support of the Link response header.
Ruslan Ermilov <ru@nginx.com>
parents:
7194
diff
changeset
|
290 offsetof(ngx_http_headers_out_t, link), 0 }, |
|
6ba68ad8b24c
Basic support of the Link response header.
Ruslan Ermilov <ru@nginx.com>
parents:
7194
diff
changeset
|
291 |
| 509 | 292 { ngx_string("X-Accel-Expires"), |
| 2664 | 293 ngx_http_upstream_process_accel_expires, 0, |
| 649 | 294 ngx_http_upstream_copy_header_line, 0, 0 }, |
| 515 | 295 |
| 296 { ngx_string("X-Accel-Redirect"), | |
| 297 ngx_http_upstream_process_header_line, | |
| 298 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
|
299 ngx_http_upstream_copy_header_line, 0, 0 }, |
| 509 | 300 |
| 527 | 301 { ngx_string("X-Accel-Limit-Rate"), |
| 302 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
|
303 ngx_http_upstream_copy_header_line, 0, 0 }, |
| 527 | 304 |
| 649 | 305 { ngx_string("X-Accel-Buffering"), |
| 306 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
|
307 ngx_http_upstream_copy_header_line, 0, 0 }, |
| 649 | 308 |
| 657 | 309 { ngx_string("X-Accel-Charset"), |
| 310 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
|
311 ngx_http_upstream_copy_header_line, 0, 0 }, |
| 657 | 312 |
|
4123
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
313 { ngx_string("Transfer-Encoding"), |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
314 ngx_http_upstream_process_transfer_encoding, 0, |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
315 ngx_http_upstream_ignore_header_line, 0, 0 }, |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
316 |
| 509 | 317 { ngx_string("Content-Encoding"), |
|
8029
e0027c8438b0
Upstream: simplified Content-Encoding handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8028
diff
changeset
|
318 ngx_http_upstream_ignore_header_line, 0, |
|
e0027c8438b0
Upstream: simplified Content-Encoding handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8028
diff
changeset
|
319 ngx_http_upstream_copy_header_line, |
|
e0027c8438b0
Upstream: simplified Content-Encoding handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8028
diff
changeset
|
320 offsetof(ngx_http_headers_out_t, content_encoding), 0 }, |
| 509 | 321 |
| 515 | 322 { ngx_null_string, NULL, 0, NULL, 0, 0 } |
| 509 | 323 }; |
| 479 | 324 |
| 325 | |
| 651 | 326 static ngx_command_t ngx_http_upstream_commands[] = { |
| 327 | |
| 328 { ngx_string("upstream"), | |
| 329 NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE1, | |
| 330 ngx_http_upstream, | |
| 331 0, | |
| 332 0, | |
| 333 NULL }, | |
| 334 | |
| 335 { ngx_string("server"), | |
| 884 | 336 NGX_HTTP_UPS_CONF|NGX_CONF_1MORE, |
| 651 | 337 ngx_http_upstream_server, |
| 338 NGX_HTTP_SRV_CONF_OFFSET, | |
| 339 0, | |
| 340 NULL }, | |
| 341 | |
| 342 ngx_null_command | |
| 343 }; | |
| 344 | |
| 345 | |
| 346 static ngx_http_module_t ngx_http_upstream_module_ctx = { | |
| 573 | 347 ngx_http_upstream_add_variables, /* preconfiguration */ |
| 509 | 348 NULL, /* postconfiguration */ |
| 349 | |
| 350 ngx_http_upstream_create_main_conf, /* create main configuration */ | |
| 651 | 351 ngx_http_upstream_init_main_conf, /* init main configuration */ |
| 479 | 352 |
| 353 NULL, /* create server configuration */ | |
| 354 NULL, /* merge server configuration */ | |
| 355 | |
| 356 NULL, /* create location configuration */ | |
| 357 NULL /* merge location configuration */ | |
| 358 }; | |
| 577 | 359 |
| 479 | 360 |
| 361 ngx_module_t ngx_http_upstream_module = { | |
| 509 | 362 NGX_MODULE_V1, |
| 479 | 363 &ngx_http_upstream_module_ctx, /* module context */ |
| 651 | 364 ngx_http_upstream_commands, /* module directives */ |
| 479 | 365 NGX_HTTP_MODULE, /* module type */ |
| 541 | 366 NULL, /* init master */ |
| 479 | 367 NULL, /* init module */ |
| 541 | 368 NULL, /* init process */ |
| 369 NULL, /* init thread */ | |
| 370 NULL, /* exit thread */ | |
| 371 NULL, /* exit process */ | |
| 372 NULL, /* exit master */ | |
| 373 NGX_MODULE_V1_PADDING | |
| 479 | 374 }; |
| 375 | |
| 376 | |
| 573 | 377 static ngx_http_variable_t ngx_http_upstream_vars[] = { |
| 378 | |
| 1181 | 379 { 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
|
380 ngx_http_upstream_addr_variable, 0, |
|
3898
bd1222fb0192
allow to use $upstream_... variables in SSI
Igor Sysoev <igor@sysoev.ru>
parents:
3879
diff
changeset
|
381 NGX_HTTP_VAR_NOCACHEABLE, 0 }, |
| 1181 | 382 |
| 637 | 383 { 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
|
384 ngx_http_upstream_status_variable, 0, |
|
3898
bd1222fb0192
allow to use $upstream_... variables in SSI
Igor Sysoev <igor@sysoev.ru>
parents:
3879
diff
changeset
|
385 NGX_HTTP_VAR_NOCACHEABLE, 0 }, |
| 573 | 386 |
|
6147
74b6ef56ea56
Upstream: $upstream_connect_time.
Ruslan Ermilov <ru@nginx.com>
parents:
6146
diff
changeset
|
387 { ngx_string("upstream_connect_time"), NULL, |
|
74b6ef56ea56
Upstream: $upstream_connect_time.
Ruslan Ermilov <ru@nginx.com>
parents:
6146
diff
changeset
|
388 ngx_http_upstream_response_time_variable, 2, |
|
74b6ef56ea56
Upstream: $upstream_connect_time.
Ruslan Ermilov <ru@nginx.com>
parents:
6146
diff
changeset
|
389 NGX_HTTP_VAR_NOCACHEABLE, 0 }, |
|
74b6ef56ea56
Upstream: $upstream_connect_time.
Ruslan Ermilov <ru@nginx.com>
parents:
6146
diff
changeset
|
390 |
|
5964
0a198a517eaf
Upstream: $upstream_header_time variable.
Vladimir Homutov <vl@nginx.com>
parents:
5960
diff
changeset
|
391 { ngx_string("upstream_header_time"), NULL, |
|
0a198a517eaf
Upstream: $upstream_header_time variable.
Vladimir Homutov <vl@nginx.com>
parents:
5960
diff
changeset
|
392 ngx_http_upstream_response_time_variable, 1, |
|
0a198a517eaf
Upstream: $upstream_header_time variable.
Vladimir Homutov <vl@nginx.com>
parents:
5960
diff
changeset
|
393 NGX_HTTP_VAR_NOCACHEABLE, 0 }, |
|
0a198a517eaf
Upstream: $upstream_header_time variable.
Vladimir Homutov <vl@nginx.com>
parents:
5960
diff
changeset
|
394 |
| 637 | 395 { 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
|
396 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
|
397 NGX_HTTP_VAR_NOCACHEABLE, 0 }, |
| 573 | 398 |
| 2402 | 399 { ngx_string("upstream_response_length"), NULL, |
| 400 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
|
401 NGX_HTTP_VAR_NOCACHEABLE, 0 }, |
| 2402 | 402 |
|
6654
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
403 { ngx_string("upstream_bytes_received"), NULL, |
|
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
404 ngx_http_upstream_response_length_variable, 1, |
|
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
405 NGX_HTTP_VAR_NOCACHEABLE, 0 }, |
|
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
406 |
|
7429
e573d74299a0
Upstream: implemented $upstream_bytes_sent.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
407 { ngx_string("upstream_bytes_sent"), NULL, |
|
e573d74299a0
Upstream: implemented $upstream_bytes_sent.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
408 ngx_http_upstream_response_length_variable, 2, |
|
e573d74299a0
Upstream: implemented $upstream_bytes_sent.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
409 NGX_HTTP_VAR_NOCACHEABLE, 0 }, |
|
e573d74299a0
Upstream: implemented $upstream_bytes_sent.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
410 |
|
2957
b4f39842523b
fix building --without-http-cache, broken in r2953
Igor Sysoev <igor@sysoev.ru>
parents:
2953
diff
changeset
|
411 #if (NGX_HTTP_CACHE) |
|
b4f39842523b
fix building --without-http-cache, broken in r2953
Igor Sysoev <igor@sysoev.ru>
parents:
2953
diff
changeset
|
412 |
| 2952 | 413 { ngx_string("upstream_cache_status"), NULL, |
| 414 ngx_http_upstream_cache_status, 0, | |
|
3898
bd1222fb0192
allow to use $upstream_... variables in SSI
Igor Sysoev <igor@sysoev.ru>
parents:
3879
diff
changeset
|
415 NGX_HTTP_VAR_NOCACHEABLE, 0 }, |
| 2952 | 416 |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
417 { ngx_string("upstream_cache_last_modified"), NULL, |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
418 ngx_http_upstream_cache_last_modified, 0, |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
419 NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 }, |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
420 |
|
5738
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
421 { ngx_string("upstream_cache_etag"), NULL, |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
422 ngx_http_upstream_cache_etag, 0, |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
423 NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 }, |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
424 |
|
2957
b4f39842523b
fix building --without-http-cache, broken in r2953
Igor Sysoev <igor@sysoev.ru>
parents:
2953
diff
changeset
|
425 #endif |
|
b4f39842523b
fix building --without-http-cache, broken in r2953
Igor Sysoev <igor@sysoev.ru>
parents:
2953
diff
changeset
|
426 |
|
6899
d2b2ff157da5
Variables: generic prefix variables.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6876
diff
changeset
|
427 { ngx_string("upstream_http_"), NULL, ngx_http_upstream_header_variable, |
|
d2b2ff157da5
Variables: generic prefix variables.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6876
diff
changeset
|
428 0, NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_PREFIX, 0 }, |
|
d2b2ff157da5
Variables: generic prefix variables.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6876
diff
changeset
|
429 |
|
7230
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
430 { ngx_string("upstream_trailer_"), NULL, ngx_http_upstream_trailer_variable, |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
431 0, NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_PREFIX, 0 }, |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
432 |
|
6899
d2b2ff157da5
Variables: generic prefix variables.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6876
diff
changeset
|
433 { ngx_string("upstream_cookie_"), NULL, ngx_http_upstream_cookie_variable, |
|
d2b2ff157da5
Variables: generic prefix variables.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6876
diff
changeset
|
434 0, NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_PREFIX, 0 }, |
|
d2b2ff157da5
Variables: generic prefix variables.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6876
diff
changeset
|
435 |
|
7077
2a288909abc6
Variables: macros for null variables.
Ruslan Ermilov <ru@nginx.com>
parents:
7070
diff
changeset
|
436 ngx_http_null_variable |
| 573 | 437 }; |
| 438 | |
| 439 | |
|
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
440 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
|
441 { 500, NGX_HTTP_UPSTREAM_FT_HTTP_500 }, |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
442 { 502, NGX_HTTP_UPSTREAM_FT_HTTP_502 }, |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
443 { 503, NGX_HTTP_UPSTREAM_FT_HTTP_503 }, |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
444 { 504, NGX_HTTP_UPSTREAM_FT_HTTP_504 }, |
|
5231
05c53652e7b4
Upstream: http_403 support in proxy_next_upstream (and friends).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5217
diff
changeset
|
445 { 403, NGX_HTTP_UPSTREAM_FT_HTTP_403 }, |
|
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
446 { 404, NGX_HTTP_UPSTREAM_FT_HTTP_404 }, |
|
6966
fa56ab75cffc
Upstream: allow recovery from "429 Too Many Requests" response.
Piotr Sikora <piotrsikora@google.com>
parents:
6961
diff
changeset
|
447 { 429, NGX_HTTP_UPSTREAM_FT_HTTP_429 }, |
|
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
448 { 0, 0 } |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
449 }; |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
450 |
|
2875
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2874
diff
changeset
|
451 |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2874
diff
changeset
|
452 ngx_conf_bitmask_t ngx_http_upstream_cache_method_mask[] = { |
| 6439 | 453 { ngx_string("GET"), NGX_HTTP_GET }, |
| 454 { ngx_string("HEAD"), NGX_HTTP_HEAD }, | |
| 455 { ngx_string("POST"), NGX_HTTP_POST }, | |
| 456 { ngx_null_string, 0 } | |
|
2875
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2874
diff
changeset
|
457 }; |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2874
diff
changeset
|
458 |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2874
diff
changeset
|
459 |
|
3667
12bd9e26fadb
use shared ngx_http_upstream_ignore_headers_masks[]
Igor Sysoev <igor@sysoev.ru>
parents:
3527
diff
changeset
|
460 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
|
461 { 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
|
462 { 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
|
463 { 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
|
464 { 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
|
465 { 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
|
466 { 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
|
467 { 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
|
468 { ngx_string("Set-Cookie"), NGX_HTTP_UPSTREAM_IGN_SET_COOKIE }, |
|
5877
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
469 { ngx_string("Vary"), NGX_HTTP_UPSTREAM_IGN_VARY }, |
|
3667
12bd9e26fadb
use shared ngx_http_upstream_ignore_headers_masks[]
Igor Sysoev <igor@sysoev.ru>
parents:
3527
diff
changeset
|
470 { ngx_null_string, 0 } |
|
12bd9e26fadb
use shared ngx_http_upstream_ignore_headers_masks[]
Igor Sysoev <igor@sysoev.ru>
parents:
3527
diff
changeset
|
471 }; |
|
12bd9e26fadb
use shared ngx_http_upstream_ignore_headers_masks[]
Igor Sysoev <igor@sysoev.ru>
parents:
3527
diff
changeset
|
472 |
|
12bd9e26fadb
use shared ngx_http_upstream_ignore_headers_masks[]
Igor Sysoev <igor@sysoev.ru>
parents:
3527
diff
changeset
|
473 |
|
3006
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
474 ngx_int_t |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
475 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
|
476 { |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
477 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
|
478 |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
479 u = r->upstream; |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
480 |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
481 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
|
482 r->main->count++; |
|
3006
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
483 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
|
484 } |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
485 |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
486 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
|
487 if (u == NULL) { |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
488 return NGX_ERROR; |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
489 } |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
490 |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
491 r->upstream = u; |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
492 |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
493 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
|
494 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
|
495 |
|
3056
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
496 #if (NGX_HTTP_CACHE) |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
497 r->cache = NULL; |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
498 #endif |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
499 |
|
4117
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
500 u->headers_in.content_length_n = -1; |
|
5869
fd283aa92e04
Upstream: fix $upstream_cache_last_modified variable.
Piotr Sikora <piotr@cloudflare.com>
parents:
5848
diff
changeset
|
501 u->headers_in.last_modified_time = -1; |
|
4117
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
502 |
|
3006
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
503 return NGX_OK; |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
504 } |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
505 |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
3004
diff
changeset
|
506 |
| 487 | 507 void |
| 508 ngx_http_upstream_init(ngx_http_request_t *r) | |
| 479 | 509 { |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
510 ngx_connection_t *c; |
| 479 | 511 |
| 512 c = r->connection; | |
| 513 | |
| 514 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, | |
| 515 "http init upstream, client timer: %d", c->read->timer_set); | |
| 516 | |
|
6246
257b51c37c5a
The HTTP/2 implementation (RFC 7240, 7241).
Valentin Bartenev <vbart@nginx.com>
parents:
6242
diff
changeset
|
517 #if (NGX_HTTP_V2) |
|
257b51c37c5a
The HTTP/2 implementation (RFC 7240, 7241).
Valentin Bartenev <vbart@nginx.com>
parents:
6242
diff
changeset
|
518 if (r->stream) { |
|
5121
c0f7b94e88ba
Preliminary experimental support for SPDY draft 2.
Valentin Bartenev <vbart@nginx.com>
parents:
5113
diff
changeset
|
519 ngx_http_upstream_init_request(r); |
|
c0f7b94e88ba
Preliminary experimental support for SPDY draft 2.
Valentin Bartenev <vbart@nginx.com>
parents:
5113
diff
changeset
|
520 return; |
|
c0f7b94e88ba
Preliminary experimental support for SPDY draft 2.
Valentin Bartenev <vbart@nginx.com>
parents:
5113
diff
changeset
|
521 } |
|
c0f7b94e88ba
Preliminary experimental support for SPDY draft 2.
Valentin Bartenev <vbart@nginx.com>
parents:
5113
diff
changeset
|
522 #endif |
|
c0f7b94e88ba
Preliminary experimental support for SPDY draft 2.
Valentin Bartenev <vbart@nginx.com>
parents:
5113
diff
changeset
|
523 |
| 479 | 524 if (c->read->timer_set) { |
| 525 ngx_del_timer(c->read); | |
| 526 } | |
| 527 | |
| 528 if (ngx_event_flags & NGX_USE_CLEAR_EVENT) { | |
| 529 | |
| 530 if (!c->write->active) { | |
| 531 | 531 if (ngx_add_event(c->write, NGX_WRITE_EVENT, NGX_CLEAR_EVENT) |
| 532 == NGX_ERROR) | |
| 479 | 533 { |
| 534 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 535 return; | |
| 536 } | |
| 537 } | |
| 538 } | |
| 539 | |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
540 ngx_http_upstream_init_request(r); |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
541 } |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
542 |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
543 |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
544 static void |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
545 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
|
546 { |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
547 ngx_str_t *host; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
548 ngx_uint_t i; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
549 ngx_resolver_ctx_t *ctx, temp; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
550 ngx_http_cleanup_t *cln; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
551 ngx_http_upstream_t *u; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
552 ngx_http_core_loc_conf_t *clcf; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
553 ngx_http_upstream_srv_conf_t *uscf, **uscfp; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
554 ngx_http_upstream_main_conf_t *umcf; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
555 |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
556 if (r->aio) { |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
557 return; |
| 537 | 558 } |
| 509 | 559 |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
560 u = r->upstream; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
561 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
562 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
563 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
564 if (u->conf->cache) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
565 ngx_int_t rc; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
566 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
567 rc = ngx_http_upstream_cache(r, u); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
568 |
|
3055
92b6cfaa3c27
fix sending a cached file using AIO
Igor Sysoev <igor@sysoev.ru>
parents:
3053
diff
changeset
|
569 if (rc == NGX_BUSY) { |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
570 r->write_event_handler = ngx_http_upstream_init_request; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
571 return; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
572 } |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
573 |
|
3055
92b6cfaa3c27
fix sending a cached file using AIO
Igor Sysoev <igor@sysoev.ru>
parents:
3053
diff
changeset
|
574 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
|
575 |
|
5827
54e9b83d00f0
Upstream: avoided directly terminating the connection.
FengGu <flygoast@126.com>
parents:
5818
diff
changeset
|
576 if (rc == NGX_ERROR) { |
|
54e9b83d00f0
Upstream: avoided directly terminating the connection.
FengGu <flygoast@126.com>
parents:
5818
diff
changeset
|
577 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
54e9b83d00f0
Upstream: avoided directly terminating the connection.
FengGu <flygoast@126.com>
parents:
5818
diff
changeset
|
578 return; |
|
54e9b83d00f0
Upstream: avoided directly terminating the connection.
FengGu <flygoast@126.com>
parents:
5818
diff
changeset
|
579 } |
|
54e9b83d00f0
Upstream: avoided directly terminating the connection.
FengGu <flygoast@126.com>
parents:
5818
diff
changeset
|
580 |
|
6242
0e3a45ec2a3a
Upstream: fixed cache send error handling.
Roman Arutyunyan <arut@nginx.com>
parents:
6180
diff
changeset
|
581 if (rc == NGX_OK) { |
|
0e3a45ec2a3a
Upstream: fixed cache send error handling.
Roman Arutyunyan <arut@nginx.com>
parents:
6180
diff
changeset
|
582 rc = ngx_http_upstream_cache_send(r, u); |
|
0e3a45ec2a3a
Upstream: fixed cache send error handling.
Roman Arutyunyan <arut@nginx.com>
parents:
6180
diff
changeset
|
583 |
|
0e3a45ec2a3a
Upstream: fixed cache send error handling.
Roman Arutyunyan <arut@nginx.com>
parents:
6180
diff
changeset
|
584 if (rc == NGX_DONE) { |
|
0e3a45ec2a3a
Upstream: fixed cache send error handling.
Roman Arutyunyan <arut@nginx.com>
parents:
6180
diff
changeset
|
585 return; |
|
0e3a45ec2a3a
Upstream: fixed cache send error handling.
Roman Arutyunyan <arut@nginx.com>
parents:
6180
diff
changeset
|
586 } |
|
0e3a45ec2a3a
Upstream: fixed cache send error handling.
Roman Arutyunyan <arut@nginx.com>
parents:
6180
diff
changeset
|
587 |
|
0e3a45ec2a3a
Upstream: fixed cache send error handling.
Roman Arutyunyan <arut@nginx.com>
parents:
6180
diff
changeset
|
588 if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) { |
|
0e3a45ec2a3a
Upstream: fixed cache send error handling.
Roman Arutyunyan <arut@nginx.com>
parents:
6180
diff
changeset
|
589 rc = NGX_DECLINED; |
|
0e3a45ec2a3a
Upstream: fixed cache send error handling.
Roman Arutyunyan <arut@nginx.com>
parents:
6180
diff
changeset
|
590 r->cached = 0; |
|
7116
46ddff109e72
Upstream: better handling of invalid headers in cache files.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7093
diff
changeset
|
591 u->buffer.start = NULL; |
|
46ddff109e72
Upstream: better handling of invalid headers in cache files.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7093
diff
changeset
|
592 u->cache_status = NGX_HTTP_CACHE_MISS; |
|
7125
b8fc701daf8e
Upstream: even better handling of invalid headers in cache files.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7117
diff
changeset
|
593 u->request_sent = 1; |
|
6242
0e3a45ec2a3a
Upstream: fixed cache send error handling.
Roman Arutyunyan <arut@nginx.com>
parents:
6180
diff
changeset
|
594 } |
|
0e3a45ec2a3a
Upstream: fixed cache send error handling.
Roman Arutyunyan <arut@nginx.com>
parents:
6180
diff
changeset
|
595 } |
|
0e3a45ec2a3a
Upstream: fixed cache send error handling.
Roman Arutyunyan <arut@nginx.com>
parents:
6180
diff
changeset
|
596 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
597 if (rc != NGX_DECLINED) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
598 ngx_http_finalize_request(r, rc); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
599 return; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
600 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
601 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
602 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
603 #endif |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
604 |
|
5947
d9025ea1f5a5
Upstream: simplified proxy_store and friends configuration code.
Valentin Bartenev <vbart@nginx.com>
parents:
5935
diff
changeset
|
605 u->store = u->conf->store; |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
606 |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
607 if (!u->store && !r->post_action && !u->conf->ignore_client_abort) { |
|
7810
1bf8ab7063de
Upstream: fixed broken connection check with eventport.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7809
diff
changeset
|
608 |
|
7811
1ebd78df4ce7
Fixed handling of already closed connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7810
diff
changeset
|
609 if (r->connection->read->ready) { |
|
1ebd78df4ce7
Fixed handling of already closed connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7810
diff
changeset
|
610 ngx_post_event(r->connection->read, &ngx_posted_events); |
|
1ebd78df4ce7
Fixed handling of already closed connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7810
diff
changeset
|
611 |
|
1ebd78df4ce7
Fixed handling of already closed connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7810
diff
changeset
|
612 } else { |
|
1ebd78df4ce7
Fixed handling of already closed connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7810
diff
changeset
|
613 if (ngx_handle_read_event(r->connection->read, 0) != NGX_OK) { |
|
1ebd78df4ce7
Fixed handling of already closed connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7810
diff
changeset
|
614 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
1ebd78df4ce7
Fixed handling of already closed connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7810
diff
changeset
|
615 return; |
|
1ebd78df4ce7
Fixed handling of already closed connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7810
diff
changeset
|
616 } |
|
7810
1bf8ab7063de
Upstream: fixed broken connection check with eventport.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7809
diff
changeset
|
617 } |
|
1bf8ab7063de
Upstream: fixed broken connection check with eventport.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7809
diff
changeset
|
618 |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
619 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
|
620 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
|
621 } |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
622 |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
623 if (r->request_body) { |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
624 u->request_bufs = r->request_body->bufs; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
625 } |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
626 |
| 537 | 627 if (u->create_request(r) != NGX_OK) { |
| 479 | 628 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); |
| 629 return; | |
| 630 } | |
| 631 | |
|
6528
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
632 if (ngx_http_upstream_set_local(r, u, u->conf->local) != NGX_OK) { |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
633 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
634 return; |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
635 } |
|
3271
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
636 |
|
7371
8b68d50090e4
Upstream: proxy_socket_keepalive and friends.
Vladimir Homutov <vl@nginx.com>
parents:
7341
diff
changeset
|
637 if (u->conf->socket_keepalive) { |
|
8b68d50090e4
Upstream: proxy_socket_keepalive and friends.
Vladimir Homutov <vl@nginx.com>
parents:
7341
diff
changeset
|
638 u->peer.so_keepalive = 1; |
|
8b68d50090e4
Upstream: proxy_socket_keepalive and friends.
Vladimir Homutov <vl@nginx.com>
parents:
7341
diff
changeset
|
639 } |
|
8b68d50090e4
Upstream: proxy_socket_keepalive and friends.
Vladimir Homutov <vl@nginx.com>
parents:
7341
diff
changeset
|
640 |
| 509 | 641 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
| 479 | 642 |
| 3053 | 643 u->output.alignment = clcf->directio_alignment; |
| 479 | 644 u->output.pool = r->pool; |
| 645 u->output.bufs.num = 1; | |
| 509 | 646 u->output.bufs.size = clcf->client_body_buffer_size; |
|
6050
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
647 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
648 if (u->output.output_filter == NULL) { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
649 u->output.output_filter = ngx_chain_writer; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
650 u->output.filter_ctx = &u->writer; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
651 } |
| 479 | 652 |
| 653 u->writer.pool = r->pool; | |
| 654 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
655 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
|
656 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
657 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
|
658 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
|
659 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
|
660 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
|
661 return; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
662 } |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
663 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
664 } else { |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
665 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
666 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
|
667 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
|
668 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
|
669 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
|
670 return; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
671 } |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
672 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
673 ngx_memzero(u->state, sizeof(ngx_http_upstream_state_t)); |
| 479 | 674 } |
| 675 | |
| 593 | 676 cln = ngx_http_cleanup_add(r, 0); |
| 569 | 677 if (cln == NULL) { |
| 678 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 679 return; | |
| 680 } | |
| 681 | |
| 682 cln->handler = ngx_http_upstream_cleanup; | |
| 683 cln->data = r; | |
| 684 u->cleanup = &cln->handler; | |
| 685 | |
| 1658 | 686 if (u->resolved == NULL) { |
| 687 | |
| 688 uscf = u->conf->upstream; | |
| 689 | |
| 690 } else { | |
| 691 | |
|
5660
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
692 #if (NGX_HTTP_SSL) |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
693 u->ssl_name = u->resolved->host; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
694 #endif |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
695 |
|
6303
a93345ee8f52
Upstream: fixed "no port" detection in evaluated upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6290
diff
changeset
|
696 host = &u->resolved->host; |
|
a93345ee8f52
Upstream: fixed "no port" detection in evaluated upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6290
diff
changeset
|
697 |
|
6786
906ac20234ed
Upstream: do not unnecessarily create per-request upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6777
diff
changeset
|
698 umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module); |
|
906ac20234ed
Upstream: do not unnecessarily create per-request upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6777
diff
changeset
|
699 |
|
906ac20234ed
Upstream: do not unnecessarily create per-request upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6777
diff
changeset
|
700 uscfp = umcf->upstreams.elts; |
|
906ac20234ed
Upstream: do not unnecessarily create per-request upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6777
diff
changeset
|
701 |
|
906ac20234ed
Upstream: do not unnecessarily create per-request upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6777
diff
changeset
|
702 for (i = 0; i < umcf->upstreams.nelts; i++) { |
|
906ac20234ed
Upstream: do not unnecessarily create per-request upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6777
diff
changeset
|
703 |
|
906ac20234ed
Upstream: do not unnecessarily create per-request upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6777
diff
changeset
|
704 uscf = uscfp[i]; |
|
906ac20234ed
Upstream: do not unnecessarily create per-request upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6777
diff
changeset
|
705 |
|
906ac20234ed
Upstream: do not unnecessarily create per-request upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6777
diff
changeset
|
706 if (uscf->host.len == host->len |
|
906ac20234ed
Upstream: do not unnecessarily create per-request upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6777
diff
changeset
|
707 && ((uscf->port == 0 && u->resolved->no_port) |
|
906ac20234ed
Upstream: do not unnecessarily create per-request upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6777
diff
changeset
|
708 || uscf->port == u->resolved->port) |
|
906ac20234ed
Upstream: do not unnecessarily create per-request upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6777
diff
changeset
|
709 && ngx_strncasecmp(uscf->host.data, host->data, host->len) == 0) |
|
906ac20234ed
Upstream: do not unnecessarily create per-request upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6777
diff
changeset
|
710 { |
|
906ac20234ed
Upstream: do not unnecessarily create per-request upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6777
diff
changeset
|
711 goto found; |
|
906ac20234ed
Upstream: do not unnecessarily create per-request upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6777
diff
changeset
|
712 } |
|
906ac20234ed
Upstream: do not unnecessarily create per-request upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6777
diff
changeset
|
713 } |
|
906ac20234ed
Upstream: do not unnecessarily create per-request upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6777
diff
changeset
|
714 |
|
2422
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
715 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
|
716 |
|
6326
705c356ce664
Fixed fastcgi_pass with UNIX socket and variables (ticket #855).
Ruslan Ermilov <ru@nginx.com>
parents:
6316
diff
changeset
|
717 if (u->resolved->port == 0 |
|
705c356ce664
Fixed fastcgi_pass with UNIX socket and variables (ticket #855).
Ruslan Ermilov <ru@nginx.com>
parents:
6316
diff
changeset
|
718 && u->resolved->sockaddr->sa_family != AF_UNIX) |
|
705c356ce664
Fixed fastcgi_pass with UNIX socket and variables (ticket #855).
Ruslan Ermilov <ru@nginx.com>
parents:
6316
diff
changeset
|
719 { |
|
6303
a93345ee8f52
Upstream: fixed "no port" detection in evaluated upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6290
diff
changeset
|
720 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
a93345ee8f52
Upstream: fixed "no port" detection in evaluated upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6290
diff
changeset
|
721 "no port in upstream \"%V\"", host); |
|
a93345ee8f52
Upstream: fixed "no port" detection in evaluated upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6290
diff
changeset
|
722 ngx_http_upstream_finalize_request(r, u, |
| 6313 | 723 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
6303
a93345ee8f52
Upstream: fixed "no port" detection in evaluated upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6290
diff
changeset
|
724 return; |
|
a93345ee8f52
Upstream: fixed "no port" detection in evaluated upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6290
diff
changeset
|
725 } |
|
a93345ee8f52
Upstream: fixed "no port" detection in evaluated upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6290
diff
changeset
|
726 |
|
2422
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
727 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
|
728 != NGX_OK) |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
729 { |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
730 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
|
731 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
|
732 return; |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
733 } |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
734 |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
735 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
|
736 |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
737 return; |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
738 } |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2413
diff
changeset
|
739 |
|
3879
502a6b0acf3f
fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass
Igor Sysoev <igor@sysoev.ru>
parents:
3713
diff
changeset
|
740 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
|
741 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
|
742 "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
|
743 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
|
744 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
|
745 return; |
|
502a6b0acf3f
fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass
Igor Sysoev <igor@sysoev.ru>
parents:
3713
diff
changeset
|
746 } |
|
502a6b0acf3f
fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass
Igor Sysoev <igor@sysoev.ru>
parents:
3713
diff
changeset
|
747 |
| 1658 | 748 temp.name = *host; |
| 749 | |
| 750 ctx = ngx_resolve_start(clcf->resolver, &temp); | |
| 751 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
|
752 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
|
753 NGX_HTTP_INTERNAL_SERVER_ERROR); |
| 1658 | 754 return; |
| 755 } | |
| 756 | |
|
1683
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
757 if (ctx == NGX_NO_RESOLVER) { |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
758 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
|
759 "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
|
760 |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
761 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
|
762 return; |
|
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
763 } |
|
1e0b028055ec
allow to use IP addresses without defined resolver
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
764 |
| 1658 | 765 ctx->name = *host; |
| 766 ctx->handler = ngx_http_upstream_resolve_handler; | |
| 767 ctx->data = r; | |
| 768 ctx->timeout = clcf->resolver_timeout; | |
| 769 | |
|
1959
4f16186f5603
quick resolving handles u->resolved->ctx by itself
Igor Sysoev <igor@sysoev.ru>
parents:
1958
diff
changeset
|
770 u->resolved->ctx = ctx; |
|
4f16186f5603
quick resolving handles u->resolved->ctx by itself
Igor Sysoev <igor@sysoev.ru>
parents:
1958
diff
changeset
|
771 |
| 1658 | 772 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
|
773 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
|
774 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
|
775 NGX_HTTP_INTERNAL_SERVER_ERROR); |
| 1658 | 776 return; |
| 777 } | |
| 778 | |
| 779 return; | |
| 780 } | |
| 781 | |
| 782 found: | |
| 783 | |
|
4964
2464ccebdb52
Upstream: fixed SIGSEGV with the "if" directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4916
diff
changeset
|
784 if (uscf == NULL) { |
|
2464ccebdb52
Upstream: fixed SIGSEGV with the "if" directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4916
diff
changeset
|
785 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
|
786 "no upstream configuration"); |
|
2464ccebdb52
Upstream: fixed SIGSEGV with the "if" directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4916
diff
changeset
|
787 ngx_http_upstream_finalize_request(r, u, |
|
2464ccebdb52
Upstream: fixed SIGSEGV with the "if" directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4916
diff
changeset
|
788 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
2464ccebdb52
Upstream: fixed SIGSEGV with the "if" directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4916
diff
changeset
|
789 return; |
|
2464ccebdb52
Upstream: fixed SIGSEGV with the "if" directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4916
diff
changeset
|
790 } |
|
2464ccebdb52
Upstream: fixed SIGSEGV with the "if" directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4916
diff
changeset
|
791 |
|
6703
edcd9303a4d3
Upstream: introduced u->upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6699
diff
changeset
|
792 u->upstream = uscf; |
|
edcd9303a4d3
Upstream: introduced u->upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6699
diff
changeset
|
793 |
|
5682
110b50657d77
Upstream: restored workaround for "if".
Maxim Dounin <mdounin@mdounin.ru>
parents:
5677
diff
changeset
|
794 #if (NGX_HTTP_SSL) |
|
110b50657d77
Upstream: restored workaround for "if".
Maxim Dounin <mdounin@mdounin.ru>
parents:
5677
diff
changeset
|
795 u->ssl_name = uscf->host; |
|
110b50657d77
Upstream: restored workaround for "if".
Maxim Dounin <mdounin@mdounin.ru>
parents:
5677
diff
changeset
|
796 #endif |
|
110b50657d77
Upstream: restored workaround for "if".
Maxim Dounin <mdounin@mdounin.ru>
parents:
5677
diff
changeset
|
797 |
| 1658 | 798 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
|
799 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
|
800 NGX_HTTP_INTERNAL_SERVER_ERROR); |
| 1658 | 801 return; |
| 802 } | |
| 803 | |
|
5832
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5827
diff
changeset
|
804 u->peer.start_time = ngx_current_msec; |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5827
diff
changeset
|
805 |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5827
diff
changeset
|
806 if (u->conf->next_upstream_tries |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5827
diff
changeset
|
807 && u->peer.tries > u->conf->next_upstream_tries) |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5827
diff
changeset
|
808 { |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5827
diff
changeset
|
809 u->peer.tries = u->conf->next_upstream_tries; |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5827
diff
changeset
|
810 } |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5827
diff
changeset
|
811 |
| 479 | 812 ngx_http_upstream_connect(r, u); |
| 813 } | |
| 814 | |
| 815 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
816 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
817 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
818 static ngx_int_t |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
819 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
|
820 { |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
821 ngx_int_t rc; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
822 ngx_http_cache_t *c; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
823 ngx_http_file_cache_t *cache; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
824 |
|
3056
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
825 c = r->cache; |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
826 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
827 if (c == NULL) { |
|
3056
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
828 |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
829 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
|
830 return NGX_DECLINED; |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
831 } |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
832 |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
833 rc = ngx_http_upstream_cache_get(r, u, &cache); |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
834 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
835 if (rc != NGX_OK) { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
836 return rc; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
837 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
838 |
|
6306
b1858fc47e3b
Style: unified request method checks.
Ruslan Ermilov <ru@nginx.com>
parents:
6303
diff
changeset
|
839 if (r->method == NGX_HTTP_HEAD && u->conf->cache_convert_head) { |
|
3056
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
840 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
|
841 } |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
842 |
|
3698
d11227f0107f
rename ngx_http_file_cache_create() to ngx_http_file_cache_new()
Igor Sysoev <igor@sysoev.ru>
parents:
3697
diff
changeset
|
843 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
|
844 return NGX_ERROR; |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
845 } |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
846 |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
847 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
|
848 return NGX_ERROR; |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
849 } |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
850 |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
851 /* TODO: add keys */ |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
852 |
|
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
853 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
|
854 |
|
7456
608810849b6d
Upstream: fixed logging of required buffer size (ticket #1722).
Chanhun Jeong <chanhun.jeong@navercorp.com>
parents:
7429
diff
changeset
|
855 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
|
856 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
|
857 "%V_buffer_size %uz is not enough for cache key, " |
|
5581
4dee5ad51e9e
Upstream: fixed error message wording.
Konstantin Pavlov <thresh@nginx.com>
parents:
5579
diff
changeset
|
858 "it should be increased to at least %uz", |
|
3976
215fe9223419
update r3945 with more descriptive error message
Igor Sysoev <igor@sysoev.ru>
parents:
3963
diff
changeset
|
859 &u->conf->module, u->conf->buffer_size, |
|
215fe9223419
update r3945 with more descriptive error message
Igor Sysoev <igor@sysoev.ru>
parents:
3963
diff
changeset
|
860 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
|
861 |
|
f1f194ceab16
fix segfault if cache key is larger than upstream buffer size
Igor Sysoev <igor@sysoev.ru>
parents:
3940
diff
changeset
|
862 r->cache = NULL; |
|
f1f194ceab16
fix segfault if cache key is larger than upstream buffer size
Igor Sysoev <igor@sysoev.ru>
parents:
3940
diff
changeset
|
863 return NGX_DECLINED; |
|
f1f194ceab16
fix segfault if cache key is larger than upstream buffer size
Igor Sysoev <igor@sysoev.ru>
parents:
3940
diff
changeset
|
864 } |
|
f1f194ceab16
fix segfault if cache key is larger than upstream buffer size
Igor Sysoev <igor@sysoev.ru>
parents:
3940
diff
changeset
|
865 |
|
4176
2b5151a2300b
Fixed cache bypass caching of non-cacheable replies (ticket #21).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4152
diff
changeset
|
866 u->cacheable = 1; |
|
2b5151a2300b
Fixed cache bypass caching of non-cacheable replies (ticket #21).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4152
diff
changeset
|
867 |
|
5950
eaeecf00d5d7
Upstream: preset some cache configuration when bypassing.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
868 c = r->cache; |
|
eaeecf00d5d7
Upstream: preset some cache configuration when bypassing.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
869 |
|
eaeecf00d5d7
Upstream: preset some cache configuration when bypassing.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
870 c->body_start = u->conf->buffer_size; |
|
eaeecf00d5d7
Upstream: preset some cache configuration when bypassing.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
871 c->min_uses = u->conf->cache_min_uses; |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
872 c->file_cache = cache; |
|
5950
eaeecf00d5d7
Upstream: preset some cache configuration when bypassing.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
873 |
|
3917
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
874 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
|
875 |
|
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
876 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
|
877 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
|
878 |
|
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
879 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
|
880 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
|
881 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
|
882 |
|
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
883 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
|
884 break; |
|
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
885 } |
|
2a70484a6580
fix a broken cached response if bypass/no_cache directive values are different,
Igor Sysoev <igor@sysoev.ru>
parents:
3898
diff
changeset
|
886 |
|
4385
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4375
diff
changeset
|
887 c->lock = u->conf->cache_lock; |
|
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4375
diff
changeset
|
888 c->lock_timeout = u->conf->cache_lock_timeout; |
|
5905
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5901
diff
changeset
|
889 c->lock_age = u->conf->cache_lock_age; |
|
4385
70ba81827472
Cache locks initial implementation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4375
diff
changeset
|
890 |
|
3056
d22afd261e72
do not create cache key in AIO invocation
Igor Sysoev <igor@sysoev.ru>
parents:
3055
diff
changeset
|
891 u->cache_status = NGX_HTTP_CACHE_MISS; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
892 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
893 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
894 rc = ngx_http_file_cache_open(r); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
895 |
|
2926
80a314b63c56
delete useless r->cache->uses
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
896 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
|
897 "http upstream cache: %i", rc); |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
898 |
| 2952 | 899 switch (rc) { |
| 900 | |
|
6906
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
901 case NGX_HTTP_CACHE_STALE: |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
902 |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
903 if (((u->conf->cache_use_stale & NGX_HTTP_UPSTREAM_FT_UPDATING) |
|
7006
9552758a786e
Background subrequests for cache updates.
Roman Arutyunyan <arut@nginx.com>
parents:
6986
diff
changeset
|
904 || c->stale_updating) && !r->background |
|
6906
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
905 && u->conf->cache_background_update) |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
906 { |
|
7514
319242d2ddc9
Upstream: background cache update before cache send (ticket #1782).
Roman Arutyunyan <arut@nginx.com>
parents:
7504
diff
changeset
|
907 if (ngx_http_upstream_cache_background_update(r, u) == NGX_OK) { |
|
319242d2ddc9
Upstream: background cache update before cache send (ticket #1782).
Roman Arutyunyan <arut@nginx.com>
parents:
7504
diff
changeset
|
908 r->cache->background = 1; |
|
319242d2ddc9
Upstream: background cache update before cache send (ticket #1782).
Roman Arutyunyan <arut@nginx.com>
parents:
7504
diff
changeset
|
909 u->cache_status = rc; |
|
319242d2ddc9
Upstream: background cache update before cache send (ticket #1782).
Roman Arutyunyan <arut@nginx.com>
parents:
7504
diff
changeset
|
910 rc = NGX_OK; |
|
319242d2ddc9
Upstream: background cache update before cache send (ticket #1782).
Roman Arutyunyan <arut@nginx.com>
parents:
7504
diff
changeset
|
911 |
|
319242d2ddc9
Upstream: background cache update before cache send (ticket #1782).
Roman Arutyunyan <arut@nginx.com>
parents:
7504
diff
changeset
|
912 } else { |
|
319242d2ddc9
Upstream: background cache update before cache send (ticket #1782).
Roman Arutyunyan <arut@nginx.com>
parents:
7504
diff
changeset
|
913 rc = NGX_ERROR; |
|
319242d2ddc9
Upstream: background cache update before cache send (ticket #1782).
Roman Arutyunyan <arut@nginx.com>
parents:
7504
diff
changeset
|
914 } |
|
6906
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
915 } |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
916 |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
917 break; |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
918 |
| 2952 | 919 case NGX_HTTP_CACHE_UPDATING: |
| 920 | |
|
6906
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
921 if (((u->conf->cache_use_stale & NGX_HTTP_UPSTREAM_FT_UPDATING) |
|
7006
9552758a786e
Background subrequests for cache updates.
Roman Arutyunyan <arut@nginx.com>
parents:
6986
diff
changeset
|
922 || c->stale_updating) && !r->background) |
|
6905
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
923 { |
| 2952 | 924 u->cache_status = rc; |
|
2927
55ceaef03d34
proxy_cache_use_stale/fastcgi_cache_use_stale updating
Igor Sysoev <igor@sysoev.ru>
parents:
2926
diff
changeset
|
925 rc = NGX_OK; |
|
55ceaef03d34
proxy_cache_use_stale/fastcgi_cache_use_stale updating
Igor Sysoev <igor@sysoev.ru>
parents:
2926
diff
changeset
|
926 |
|
55ceaef03d34
proxy_cache_use_stale/fastcgi_cache_use_stale updating
Igor Sysoev <igor@sysoev.ru>
parents:
2926
diff
changeset
|
927 } else { |
|
55ceaef03d34
proxy_cache_use_stale/fastcgi_cache_use_stale updating
Igor Sysoev <igor@sysoev.ru>
parents:
2926
diff
changeset
|
928 rc = NGX_HTTP_CACHE_STALE; |
|
55ceaef03d34
proxy_cache_use_stale/fastcgi_cache_use_stale updating
Igor Sysoev <igor@sysoev.ru>
parents:
2926
diff
changeset
|
929 } |
| 2952 | 930 |
| 931 break; | |
| 932 | |
| 933 case NGX_OK: | |
| 934 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
|
935 } |
|
55ceaef03d34
proxy_cache_use_stale/fastcgi_cache_use_stale updating
Igor Sysoev <igor@sysoev.ru>
parents:
2926
diff
changeset
|
936 |
| 2952 | 937 switch (rc) { |
| 938 | |
| 939 case NGX_OK: | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
940 |
|
6242
0e3a45ec2a3a
Upstream: fixed cache send error handling.
Roman Arutyunyan <arut@nginx.com>
parents:
6180
diff
changeset
|
941 return NGX_OK; |
| 2952 | 942 |
| 943 case NGX_HTTP_CACHE_STALE: | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
944 |
|
2665
4d627567c324
fix r2664: ..._cache_valid did not work for stale responses
Igor Sysoev <igor@sysoev.ru>
parents:
2664
diff
changeset
|
945 c->valid_sec = 0; |
|
6905
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
946 c->updating_sec = 0; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
947 c->error_sec = 0; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
948 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
949 u->buffer.start = NULL; |
| 2952 | 950 u->cache_status = NGX_HTTP_CACHE_EXPIRED; |
| 951 | |
| 952 break; | |
| 953 | |
| 954 case NGX_DECLINED: | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
955 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
956 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
|
957 u->buffer.start = NULL; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
958 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
959 } else { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
960 u->buffer.pos = u->buffer.start + c->header_start; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
961 u->buffer.last = u->buffer.pos; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
962 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
963 |
| 2952 | 964 break; |
| 965 | |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
966 case NGX_HTTP_CACHE_SCARCE: |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
967 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
968 u->cacheable = 0; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
969 |
| 2952 | 970 break; |
| 971 | |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
972 case NGX_AGAIN: |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
973 |
|
3055
92b6cfaa3c27
fix sending a cached file using AIO
Igor Sysoev <igor@sysoev.ru>
parents:
3053
diff
changeset
|
974 return NGX_BUSY; |
|
3052
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
975 |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
976 case NGX_ERROR: |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
977 |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
978 return NGX_ERROR; |
|
6060225e9261
FreeBSD and Linux AIO support
Igor Sysoev <igor@sysoev.ru>
parents:
3050
diff
changeset
|
979 |
| 2952 | 980 default: |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
981 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
982 /* 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
|
983 |
| 2952 | 984 u->cache_status = NGX_HTTP_CACHE_HIT; |
| 985 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
986 return rc; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
987 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
988 |
|
6793
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
989 if (ngx_http_upstream_cache_check_range(r, u) == NGX_DECLINED) { |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
990 u->cacheable = 0; |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
991 } |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
992 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
993 r->cached = 0; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
994 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
995 return NGX_DECLINED; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
996 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
997 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
998 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
999 static ngx_int_t |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1000 ngx_http_upstream_cache_get(ngx_http_request_t *r, ngx_http_upstream_t *u, |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1001 ngx_http_file_cache_t **cache) |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1002 { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1003 ngx_str_t *name, val; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1004 ngx_uint_t i; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1005 ngx_http_file_cache_t **caches; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1006 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1007 if (u->conf->cache_zone) { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1008 *cache = u->conf->cache_zone->data; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1009 return NGX_OK; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1010 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1011 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1012 if (ngx_http_complex_value(r, u->conf->cache_value, &val) != NGX_OK) { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1013 return NGX_ERROR; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1014 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1015 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1016 if (val.len == 0 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1017 || (val.len == 3 && ngx_strncmp(val.data, "off", 3) == 0)) |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1018 { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1019 return NGX_DECLINED; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1020 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1021 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1022 caches = u->caches->elts; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1023 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1024 for (i = 0; i < u->caches->nelts; i++) { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1025 name = &caches[i]->shm_zone->shm.name; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1026 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1027 if (name->len == val.len |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1028 && ngx_strncmp(name->data, val.data, val.len) == 0) |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1029 { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1030 *cache = caches[i]; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1031 return NGX_OK; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1032 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1033 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1034 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1035 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1036 "cache \"%V\" not found", &val); |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1037 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1038 return NGX_ERROR; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1039 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1040 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1041 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5950
diff
changeset
|
1042 static ngx_int_t |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1043 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
|
1044 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1045 ngx_int_t rc; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1046 ngx_http_cache_t *c; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1047 |
| 2952 | 1048 r->cached = 1; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1049 c = r->cache; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1050 |
|
3369
479468a7d982
fix handling cached HTTP/0.9 response
Igor Sysoev <igor@sysoev.ru>
parents:
3272
diff
changeset
|
1051 if (c->header_start == c->body_start) { |
|
479468a7d982
fix handling cached HTTP/0.9 response
Igor Sysoev <igor@sysoev.ru>
parents:
3272
diff
changeset
|
1052 r->http_version = NGX_HTTP_VERSION_9; |
|
479468a7d982
fix handling cached HTTP/0.9 response
Igor Sysoev <igor@sysoev.ru>
parents:
3272
diff
changeset
|
1053 return ngx_http_cache_send(r); |
|
479468a7d982
fix handling cached HTTP/0.9 response
Igor Sysoev <igor@sysoev.ru>
parents:
3272
diff
changeset
|
1054 } |
|
479468a7d982
fix handling cached HTTP/0.9 response
Igor Sysoev <igor@sysoev.ru>
parents:
3272
diff
changeset
|
1055 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1056 /* TODO: cache stack */ |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1057 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1058 u->buffer = *c->buf; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1059 u->buffer.pos += c->header_start; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1060 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1061 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
|
1062 u->headers_in.content_length_n = -1; |
|
5869
fd283aa92e04
Upstream: fix $upstream_cache_last_modified variable.
Piotr Sikora <piotr@cloudflare.com>
parents:
5848
diff
changeset
|
1063 u->headers_in.last_modified_time = -1; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1064 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1065 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
|
1066 sizeof(ngx_table_elt_t)) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1067 != NGX_OK) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1068 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1069 return NGX_ERROR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1070 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1071 |
|
7230
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
1072 if (ngx_list_init(&u->headers_in.trailers, r->pool, 2, |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
1073 sizeof(ngx_table_elt_t)) |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
1074 != NGX_OK) |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
1075 { |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
1076 return NGX_ERROR; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
1077 } |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
1078 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1079 rc = u->process_header(r); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1080 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1081 if (rc == NGX_OK) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1082 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1083 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
|
1084 return NGX_DONE; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1085 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1086 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1087 return ngx_http_cache_send(r); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1088 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1089 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1090 if (rc == NGX_ERROR) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1091 return NGX_ERROR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1092 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1093 |
|
7116
46ddff109e72
Upstream: better handling of invalid headers in cache files.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7093
diff
changeset
|
1094 if (rc == NGX_AGAIN) { |
|
46ddff109e72
Upstream: better handling of invalid headers in cache files.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7093
diff
changeset
|
1095 rc = NGX_HTTP_UPSTREAM_INVALID_HEADER; |
|
46ddff109e72
Upstream: better handling of invalid headers in cache files.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7093
diff
changeset
|
1096 } |
|
46ddff109e72
Upstream: better handling of invalid headers in cache files.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7093
diff
changeset
|
1097 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1098 /* rc == NGX_HTTP_UPSTREAM_INVALID_HEADER */ |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1099 |
|
7116
46ddff109e72
Upstream: better handling of invalid headers in cache files.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7093
diff
changeset
|
1100 ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0, |
|
46ddff109e72
Upstream: better handling of invalid headers in cache files.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7093
diff
changeset
|
1101 "cache file \"%s\" contains invalid header", |
|
46ddff109e72
Upstream: better handling of invalid headers in cache files.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7093
diff
changeset
|
1102 c->file.name.data); |
|
46ddff109e72
Upstream: better handling of invalid headers in cache files.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7093
diff
changeset
|
1103 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1104 /* TODO: delete file */ |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1105 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1106 return rc; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1107 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1108 |
|
6793
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1109 |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1110 static ngx_int_t |
|
6906
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1111 ngx_http_upstream_cache_background_update(ngx_http_request_t *r, |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1112 ngx_http_upstream_t *u) |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1113 { |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1114 ngx_http_request_t *sr; |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1115 |
|
7070
f583559aadc7
Upstream: keep request body file from removal if requested.
Roman Arutyunyan <arut@nginx.com>
parents:
7067
diff
changeset
|
1116 if (r == r->main) { |
|
f583559aadc7
Upstream: keep request body file from removal if requested.
Roman Arutyunyan <arut@nginx.com>
parents:
7067
diff
changeset
|
1117 r->preserve_body = 1; |
|
f583559aadc7
Upstream: keep request body file from removal if requested.
Roman Arutyunyan <arut@nginx.com>
parents:
7067
diff
changeset
|
1118 } |
|
f583559aadc7
Upstream: keep request body file from removal if requested.
Roman Arutyunyan <arut@nginx.com>
parents:
7067
diff
changeset
|
1119 |
|
6906
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1120 if (ngx_http_subrequest(r, &r->uri, &r->args, &sr, NULL, |
|
7006
9552758a786e
Background subrequests for cache updates.
Roman Arutyunyan <arut@nginx.com>
parents:
6986
diff
changeset
|
1121 NGX_HTTP_SUBREQUEST_CLONE |
|
9552758a786e
Background subrequests for cache updates.
Roman Arutyunyan <arut@nginx.com>
parents:
6986
diff
changeset
|
1122 |NGX_HTTP_SUBREQUEST_BACKGROUND) |
|
6906
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1123 != NGX_OK) |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1124 { |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1125 return NGX_ERROR; |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1126 } |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1127 |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1128 sr->header_only = 1; |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1129 |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1130 return NGX_OK; |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1131 } |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1132 |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1133 |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6905
diff
changeset
|
1134 static ngx_int_t |
|
6793
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1135 ngx_http_upstream_cache_check_range(ngx_http_request_t *r, |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1136 ngx_http_upstream_t *u) |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1137 { |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1138 off_t offset; |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1139 u_char *p, *start; |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1140 ngx_table_elt_t *h; |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1141 |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1142 h = r->headers_in.range; |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1143 |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1144 if (h == NULL |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1145 || !u->cacheable |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1146 || u->conf->cache_max_range_offset == NGX_MAX_OFF_T_VALUE) |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1147 { |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1148 return NGX_OK; |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1149 } |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1150 |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1151 if (u->conf->cache_max_range_offset == 0) { |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1152 return NGX_DECLINED; |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1153 } |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1154 |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1155 if (h->value.len < 7 |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1156 || ngx_strncasecmp(h->value.data, (u_char *) "bytes=", 6) != 0) |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1157 { |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1158 return NGX_OK; |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1159 } |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1160 |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1161 p = h->value.data + 6; |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1162 |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1163 while (*p == ' ') { p++; } |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1164 |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1165 if (*p == '-') { |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1166 return NGX_DECLINED; |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1167 } |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1168 |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1169 start = p; |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1170 |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1171 while (*p >= '0' && *p <= '9') { p++; } |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1172 |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1173 offset = ngx_atoof(start, p - start); |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1174 |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1175 if (offset >= u->conf->cache_max_range_offset) { |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1176 return NGX_DECLINED; |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1177 } |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1178 |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1179 return NGX_OK; |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1180 } |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6789
diff
changeset
|
1181 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1182 #endif |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1183 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
1184 |
| 487 | 1185 static void |
| 1658 | 1186 ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx) |
| 1187 { | |
|
7041
6169dbad37d8
Upstream: fixed running posted requests (ticket #788).
Roman Arutyunyan <arut@nginx.com>
parents:
7018
diff
changeset
|
1188 ngx_uint_t run_posted; |
|
5113
08b36f2afc3f
Upstream: fixed previous commit.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5112
diff
changeset
|
1189 ngx_connection_t *c; |
| 1658 | 1190 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
|
1191 ngx_http_upstream_t *u; |
| 1658 | 1192 ngx_http_upstream_resolved_t *ur; |
| 1193 | |
|
7041
6169dbad37d8
Upstream: fixed running posted requests (ticket #788).
Roman Arutyunyan <arut@nginx.com>
parents:
7018
diff
changeset
|
1194 run_posted = ctx->async; |
|
6169dbad37d8
Upstream: fixed running posted requests (ticket #788).
Roman Arutyunyan <arut@nginx.com>
parents:
7018
diff
changeset
|
1195 |
| 1658 | 1196 r = ctx->data; |
|
5113
08b36f2afc3f
Upstream: fixed previous commit.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5112
diff
changeset
|
1197 c = r->connection; |
| 1658 | 1198 |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
1199 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
|
1200 ur = u->resolved; |
| 1658 | 1201 |
|
5928
8dfee01ff0bd
Upstream: improved subrequest logging.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5911
diff
changeset
|
1202 ngx_http_set_log_request(c->log, r); |
|
8dfee01ff0bd
Upstream: improved subrequest logging.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5911
diff
changeset
|
1203 |
|
8dfee01ff0bd
Upstream: improved subrequest logging.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5911
diff
changeset
|
1204 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, |
|
8dfee01ff0bd
Upstream: improved subrequest logging.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5911
diff
changeset
|
1205 "http upstream resolve: \"%V?%V\"", &r->uri, &r->args); |
|
8dfee01ff0bd
Upstream: improved subrequest logging.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5911
diff
changeset
|
1206 |
| 1658 | 1207 if (ctx->state) { |
| 1208 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 1209 "%V could not be resolved (%i: %s)", | |
| 1210 &ctx->name, ctx->state, | |
| 1211 ngx_resolver_strerror(ctx->state)); | |
| 1212 | |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
1213 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY); |
|
5112
d3c15c7831eb
Upstream: call ngx_http_run_posted_requests() on resolve errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5104
diff
changeset
|
1214 goto failed; |
| 1658 | 1215 } |
| 1216 | |
| 1217 ur->naddrs = ctx->naddrs; | |
| 1218 ur->addrs = ctx->addrs; | |
| 1219 | |
| 1220 #if (NGX_DEBUG) | |
| 1221 { | |
|
5475
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5453
diff
changeset
|
1222 u_char text[NGX_SOCKADDR_STRLEN]; |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5453
diff
changeset
|
1223 ngx_str_t addr; |
| 1658 | 1224 ngx_uint_t i; |
| 1225 | |
|
5475
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5453
diff
changeset
|
1226 addr.data = text; |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5453
diff
changeset
|
1227 |
| 1658 | 1228 for (i = 0; i < ctx->naddrs; i++) { |
|
5475
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5453
diff
changeset
|
1229 addr.len = ngx_sock_ntop(ur->addrs[i].sockaddr, ur->addrs[i].socklen, |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5453
diff
changeset
|
1230 text, NGX_SOCKADDR_STRLEN, 0); |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5453
diff
changeset
|
1231 |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5453
diff
changeset
|
1232 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
07dd5bd222ac
Changed resolver API to use ngx_addr_t.
Ruslan Ermilov <ru@nginx.com>
parents:
5453
diff
changeset
|
1233 "name was resolved to %V", &addr); |
| 1658 | 1234 } |
| 1235 } | |
| 1236 #endif | |
| 1237 | |
| 1238 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
|
1239 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
|
1240 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
5112
d3c15c7831eb
Upstream: call ngx_http_run_posted_requests() on resolve errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5104
diff
changeset
|
1241 goto failed; |
| 1658 | 1242 } |
| 1243 | |
| 1244 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
|
1245 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
|
1246 |
|
5885
5a042519bfe7
Upstream: limited next_upstream time and tries when resolving DNS.
Gu Feng <flygoast@126.com>
parents:
5883
diff
changeset
|
1247 u->peer.start_time = ngx_current_msec; |
|
5a042519bfe7
Upstream: limited next_upstream time and tries when resolving DNS.
Gu Feng <flygoast@126.com>
parents:
5883
diff
changeset
|
1248 |
|
5a042519bfe7
Upstream: limited next_upstream time and tries when resolving DNS.
Gu Feng <flygoast@126.com>
parents:
5883
diff
changeset
|
1249 if (u->conf->next_upstream_tries |
|
5a042519bfe7
Upstream: limited next_upstream time and tries when resolving DNS.
Gu Feng <flygoast@126.com>
parents:
5883
diff
changeset
|
1250 && u->peer.tries > u->conf->next_upstream_tries) |
|
5a042519bfe7
Upstream: limited next_upstream time and tries when resolving DNS.
Gu Feng <flygoast@126.com>
parents:
5883
diff
changeset
|
1251 { |
|
5a042519bfe7
Upstream: limited next_upstream time and tries when resolving DNS.
Gu Feng <flygoast@126.com>
parents:
5883
diff
changeset
|
1252 u->peer.tries = u->conf->next_upstream_tries; |
|
5a042519bfe7
Upstream: limited next_upstream time and tries when resolving DNS.
Gu Feng <flygoast@126.com>
parents:
5883
diff
changeset
|
1253 } |
|
5a042519bfe7
Upstream: limited next_upstream time and tries when resolving DNS.
Gu Feng <flygoast@126.com>
parents:
5883
diff
changeset
|
1254 |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
1255 ngx_http_upstream_connect(r, u); |
|
5112
d3c15c7831eb
Upstream: call ngx_http_run_posted_requests() on resolve errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5104
diff
changeset
|
1256 |
|
d3c15c7831eb
Upstream: call ngx_http_run_posted_requests() on resolve errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5104
diff
changeset
|
1257 failed: |
|
d3c15c7831eb
Upstream: call ngx_http_run_posted_requests() on resolve errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5104
diff
changeset
|
1258 |
|
7041
6169dbad37d8
Upstream: fixed running posted requests (ticket #788).
Roman Arutyunyan <arut@nginx.com>
parents:
7018
diff
changeset
|
1259 if (run_posted) { |
|
6169dbad37d8
Upstream: fixed running posted requests (ticket #788).
Roman Arutyunyan <arut@nginx.com>
parents:
7018
diff
changeset
|
1260 ngx_http_run_posted_requests(c); |
|
6169dbad37d8
Upstream: fixed running posted requests (ticket #788).
Roman Arutyunyan <arut@nginx.com>
parents:
7018
diff
changeset
|
1261 } |
| 1658 | 1262 } |
| 1263 | |
| 1264 | |
| 1265 static void | |
|
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1266 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
|
1267 { |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1268 ngx_connection_t *c; |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1269 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
|
1270 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
|
1271 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1272 c = ev->data; |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1273 r = c->data; |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1274 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1275 u = r->upstream; |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1276 c = r->connection; |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1277 |
|
5928
8dfee01ff0bd
Upstream: improved subrequest logging.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5911
diff
changeset
|
1278 ngx_http_set_log_request(c->log, r); |
|
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1279 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1280 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
|
1281 "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
|
1282 |
|
6961
903fb1ddc07f
Moved handling of wev->delayed to the connection event handler.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6950
diff
changeset
|
1283 if (ev->delayed && ev->timedout) { |
|
903fb1ddc07f
Moved handling of wev->delayed to the connection event handler.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6950
diff
changeset
|
1284 ev->delayed = 0; |
|
903fb1ddc07f
Moved handling of wev->delayed to the connection event handler.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6950
diff
changeset
|
1285 ev->timedout = 0; |
|
903fb1ddc07f
Moved handling of wev->delayed to the connection event handler.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6950
diff
changeset
|
1286 } |
|
903fb1ddc07f
Moved handling of wev->delayed to the connection event handler.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6950
diff
changeset
|
1287 |
|
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1288 if (ev->write) { |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1289 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
|
1290 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1291 } else { |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
1292 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
|
1293 } |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1294 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1295 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
|
1296 } |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1297 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1298 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1299 static void |
| 509 | 1300 ngx_http_upstream_rd_check_broken_connection(ngx_http_request_t *r) |
| 1301 { | |
| 1302 ngx_http_upstream_check_broken_connection(r, r->connection->read); | |
| 1303 } | |
| 1304 | |
| 1305 | |
| 1306 static void | |
| 1307 ngx_http_upstream_wr_check_broken_connection(ngx_http_request_t *r) | |
| 1308 { | |
| 1309 ngx_http_upstream_check_broken_connection(r, r->connection->write); | |
| 1310 } | |
| 1311 | |
| 1312 | |
| 1313 static void | |
| 1314 ngx_http_upstream_check_broken_connection(ngx_http_request_t *r, | |
| 1315 ngx_event_t *ev) | |
| 479 | 1316 { |
| 1317 int n; | |
| 1318 char buf[1]; | |
| 577 | 1319 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
|
1320 ngx_int_t event; |
| 479 | 1321 ngx_connection_t *c; |
| 1322 ngx_http_upstream_t *u; | |
| 1323 | |
| 527 | 1324 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ev->log, 0, |
| 1325 "http upstream check client, write event:%d, \"%V\"", | |
| 1326 ev->write, &r->uri); | |
| 479 | 1327 |
| 509 | 1328 c = r->connection; |
| 483 | 1329 u = r->upstream; |
| 1330 | |
| 583 | 1331 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
|
1332 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
|
1333 |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
1334 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
|
1335 |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
1336 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
|
1337 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
|
1338 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
|
1339 return; |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
1340 } |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
1341 } |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
1342 |
|
2757
9cc973b46af1
get a full response if the response is cacheable or storable even
Igor Sysoev <igor@sysoev.ru>
parents:
2708
diff
changeset
|
1343 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
|
1344 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
|
1345 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
|
1346 } |
|
2807
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
1347 |
| 527 | 1348 return; |
| 1349 } | |
| 1350 | |
|
6246
257b51c37c5a
The HTTP/2 implementation (RFC 7240, 7241).
Valentin Bartenev <vbart@nginx.com>
parents:
6242
diff
changeset
|
1351 #if (NGX_HTTP_V2) |
|
257b51c37c5a
The HTTP/2 implementation (RFC 7240, 7241).
Valentin Bartenev <vbart@nginx.com>
parents:
6242
diff
changeset
|
1352 if (r->stream) { |
|
5121
c0f7b94e88ba
Preliminary experimental support for SPDY draft 2.
Valentin Bartenev <vbart@nginx.com>
parents:
5113
diff
changeset
|
1353 return; |
|
c0f7b94e88ba
Preliminary experimental support for SPDY draft 2.
Valentin Bartenev <vbart@nginx.com>
parents:
5113
diff
changeset
|
1354 } |
|
c0f7b94e88ba
Preliminary experimental support for SPDY draft 2.
Valentin Bartenev <vbart@nginx.com>
parents:
5113
diff
changeset
|
1355 #endif |
|
c0f7b94e88ba
Preliminary experimental support for SPDY draft 2.
Valentin Bartenev <vbart@nginx.com>
parents:
5113
diff
changeset
|
1356 |
| 479 | 1357 #if (NGX_HAVE_KQUEUE) |
| 1358 | |
| 1359 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { | |
| 1360 | |
| 1361 if (!ev->pending_eof) { | |
| 1362 return; | |
| 1363 } | |
| 1364 | |
| 1365 ev->eof = 1; | |
| 583 | 1366 c->error = 1; |
| 479 | 1367 |
| 1368 if (ev->kq_errno) { | |
| 1369 ev->error = 1; | |
| 1370 } | |
| 1371 | |
|
2757
9cc973b46af1
get a full response if the response is cacheable or storable even
Igor Sysoev <igor@sysoev.ru>
parents:
2708
diff
changeset
|
1372 if (!u->cacheable && u->peer.connection) { |
| 479 | 1373 ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno, |
| 4182 | 1374 "kevent() reported that client prematurely closed " |
| 527 | 1375 "connection, so upstream connection is closed too"); |
| 479 | 1376 ngx_http_upstream_finalize_request(r, u, |
| 1377 NGX_HTTP_CLIENT_CLOSED_REQUEST); | |
| 1378 return; | |
| 1379 } | |
| 1380 | |
| 1381 ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno, | |
| 4182 | 1382 "kevent() reported that client prematurely closed " |
| 1383 "connection"); | |
| 479 | 1384 |
| 1385 if (u->peer.connection == NULL) { | |
| 1386 ngx_http_upstream_finalize_request(r, u, | |
| 1387 NGX_HTTP_CLIENT_CLOSED_REQUEST); | |
| 1388 } | |
| 1389 | |
| 1390 return; | |
| 1391 } | |
| 1392 | |
| 1393 #endif | |
| 1394 | |
|
5373
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1395 #if (NGX_HAVE_EPOLLRDHUP) |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1396 |
|
6536
f7849bfb6d21
Improved EPOLLRDHUP handling.
Valentin Bartenev <vbart@nginx.com>
parents:
6530
diff
changeset
|
1397 if ((ngx_event_flags & NGX_USE_EPOLL_EVENT) && ngx_use_epoll_rdhup) { |
|
5373
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1398 socklen_t len; |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1399 |
|
6536
f7849bfb6d21
Improved EPOLLRDHUP handling.
Valentin Bartenev <vbart@nginx.com>
parents:
6530
diff
changeset
|
1400 if (!ev->pending_eof) { |
|
f7849bfb6d21
Improved EPOLLRDHUP handling.
Valentin Bartenev <vbart@nginx.com>
parents:
6530
diff
changeset
|
1401 return; |
|
f7849bfb6d21
Improved EPOLLRDHUP handling.
Valentin Bartenev <vbart@nginx.com>
parents:
6530
diff
changeset
|
1402 } |
|
f7849bfb6d21
Improved EPOLLRDHUP handling.
Valentin Bartenev <vbart@nginx.com>
parents:
6530
diff
changeset
|
1403 |
|
5373
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1404 ev->eof = 1; |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1405 c->error = 1; |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1406 |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1407 err = 0; |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1408 len = sizeof(ngx_err_t); |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1409 |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1410 /* |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1411 * BSDs and Linux return 0 and set a pending error in err |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1412 * Solaris returns -1 and sets errno |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1413 */ |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1414 |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1415 if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, (void *) &err, &len) |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1416 == -1) |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1417 { |
|
5557
188481078faf
Use ngx_socket_errno where appropriate.
Piotr Sikora <piotr@cloudflare.com>
parents:
5546
diff
changeset
|
1418 err = ngx_socket_errno; |
|
5373
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1419 } |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1420 |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1421 if (err) { |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1422 ev->error = 1; |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1423 } |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1424 |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1425 if (!u->cacheable && u->peer.connection) { |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1426 ngx_log_error(NGX_LOG_INFO, ev->log, err, |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1427 "epoll_wait() reported that client prematurely closed " |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1428 "connection, so upstream connection is closed too"); |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1429 ngx_http_upstream_finalize_request(r, u, |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1430 NGX_HTTP_CLIENT_CLOSED_REQUEST); |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1431 return; |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1432 } |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1433 |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1434 ngx_log_error(NGX_LOG_INFO, ev->log, err, |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1435 "epoll_wait() reported that client prematurely closed " |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1436 "connection"); |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1437 |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1438 if (u->peer.connection == NULL) { |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1439 ngx_http_upstream_finalize_request(r, u, |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1440 NGX_HTTP_CLIENT_CLOSED_REQUEST); |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1441 } |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1442 |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1443 return; |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1444 } |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1445 |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1446 #endif |
|
46bdbca10dfc
Upstream: use EPOLLRDHUP to check broken connections (ticket #320).
Valentin Bartenev <vbart@nginx.com>
parents:
5368
diff
changeset
|
1447 |
| 479 | 1448 n = recv(c->fd, buf, 1, MSG_PEEK); |
| 1449 | |
| 1450 err = ngx_socket_errno; | |
| 1451 | |
| 1109 | 1452 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, err, |
| 1453 "http upstream recv(): %d", n); | |
| 1454 | |
| 479 | 1455 if (ev->write && (n >= 0 || err == NGX_EAGAIN)) { |
| 1456 return; | |
| 1457 } | |
| 1458 | |
| 1459 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
|
1460 |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
1461 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
|
1462 |
|
6ad4bba6313e
delete level event of appropriate type, this should fix select()'s EBADF,
Igor Sysoev <igor@sysoev.ru>
parents:
2805
diff
changeset
|
1463 if (ngx_del_event(ev, event, 0) != NGX_OK) { |
| 479 | 1464 ngx_http_upstream_finalize_request(r, u, |
| 1465 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1466 return; | |
| 1467 } | |
| 1468 } | |
| 1469 | |
| 1470 if (n > 0) { | |
| 1471 return; | |
| 1472 } | |
| 1473 | |
| 1474 if (n == -1) { | |
| 1475 if (err == NGX_EAGAIN) { | |
| 1476 return; | |
| 1477 } | |
| 1478 | |
| 1479 ev->error = 1; | |
| 1480 | |
| 483 | 1481 } else { /* n == 0 */ |
| 479 | 1482 err = 0; |
| 1483 } | |
| 1484 | |
| 529 | 1485 ev->eof = 1; |
| 583 | 1486 c->error = 1; |
| 529 | 1487 |
|
2757
9cc973b46af1
get a full response if the response is cacheable or storable even
Igor Sysoev <igor@sysoev.ru>
parents:
2708
diff
changeset
|
1488 if (!u->cacheable && u->peer.connection) { |
| 479 | 1489 ngx_log_error(NGX_LOG_INFO, ev->log, err, |
| 4182 | 1490 "client prematurely closed connection, " |
| 479 | 1491 "so upstream connection is closed too"); |
| 1492 ngx_http_upstream_finalize_request(r, u, | |
| 1493 NGX_HTTP_CLIENT_CLOSED_REQUEST); | |
| 1494 return; | |
| 1495 } | |
| 1496 | |
| 1497 ngx_log_error(NGX_LOG_INFO, ev->log, err, | |
| 4182 | 1498 "client prematurely closed connection"); |
| 479 | 1499 |
| 1500 if (u->peer.connection == NULL) { | |
| 1501 ngx_http_upstream_finalize_request(r, u, | |
| 1502 NGX_HTTP_CLIENT_CLOSED_REQUEST); | |
| 1503 } | |
| 1504 } | |
| 1505 | |
| 1506 | |
| 487 | 1507 static void |
| 1508 ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u) | |
| 479 | 1509 { |
|
7949
862f6130d357
Upstream: sendfile_max_chunk support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7941
diff
changeset
|
1510 ngx_int_t rc; |
|
862f6130d357
Upstream: sendfile_max_chunk support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7941
diff
changeset
|
1511 ngx_connection_t *c; |
|
862f6130d357
Upstream: sendfile_max_chunk support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7941
diff
changeset
|
1512 ngx_http_core_loc_conf_t *clcf; |
| 479 | 1513 |
| 483 | 1514 r->connection->log->action = "connecting to upstream"; |
| 479 | 1515 |
|
7397
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
1516 if (u->state && u->state->response_time == (ngx_msec_t) -1) { |
|
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
1517 u->state->response_time = ngx_current_msec - u->start_time; |
| 665 | 1518 } |
| 1519 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
1520 u->state = ngx_array_push(r->upstream_states); |
| 665 | 1521 if (u->state == NULL) { |
| 1522 ngx_http_upstream_finalize_request(r, u, | |
| 1523 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1524 return; | |
| 1525 } | |
| 1526 | |
| 1527 ngx_memzero(u->state, sizeof(ngx_http_upstream_state_t)); | |
| 1528 | |
|
7397
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
1529 u->start_time = ngx_current_msec; |
|
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
1530 |
|
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
1531 u->state->response_time = (ngx_msec_t) -1; |
|
6147
74b6ef56ea56
Upstream: $upstream_connect_time.
Ruslan Ermilov <ru@nginx.com>
parents:
6146
diff
changeset
|
1532 u->state->connect_time = (ngx_msec_t) -1; |
|
6146
59fc60585f1e
Upstream: times to obtain header/response are stored as ngx_msec_t.
Ruslan Ermilov <ru@nginx.com>
parents:
6125
diff
changeset
|
1533 u->state->header_time = (ngx_msec_t) -1; |
| 665 | 1534 |
| 479 | 1535 rc = ngx_event_connect_peer(&u->peer); |
| 1536 | |
| 1537 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 1538 "http upstream connect: %i", rc); | |
| 1539 | |
| 1540 if (rc == NGX_ERROR) { | |
| 1541 ngx_http_upstream_finalize_request(r, u, | |
| 1542 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1543 return; | |
| 1544 } | |
| 1545 | |
|
1707
f3188f6eae1f
$upstream_addr did not contain last address, the bug was introduced in r1659
Igor Sysoev <igor@sysoev.ru>
parents:
1706
diff
changeset
|
1546 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
|
1547 |
| 543 | 1548 if (rc == NGX_BUSY) { |
| 1549 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "no live upstreams"); | |
| 1378 | 1550 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_NOLIVE); |
| 1551 return; | |
| 543 | 1552 } |
| 1553 | |
| 1378 | 1554 if (rc == NGX_DECLINED) { |
| 479 | 1555 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); |
| 1556 return; | |
| 1557 } | |
| 1558 | |
|
5261
af60a210cb78
Upstream: updated list of ngx_event_connect_peer() return values.
Ruslan Ermilov <ru@nginx.com>
parents:
5231
diff
changeset
|
1559 /* rc == NGX_OK || rc == NGX_AGAIN || rc == NGX_DONE */ |
| 577 | 1560 |
| 479 | 1561 c = u->peer.connection; |
| 1562 | |
|
7340
70c6b08973a0
Upstream keepalive: keepalive_requests directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7320
diff
changeset
|
1563 c->requests++; |
|
70c6b08973a0
Upstream keepalive: keepalive_requests directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7320
diff
changeset
|
1564 |
| 479 | 1565 c->data = r; |
| 591 | 1566 |
|
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1567 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
|
1568 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
|
1569 |
|
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1570 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
|
1571 u->read_event_handler = ngx_http_upstream_process_header; |
| 479 | 1572 |
|
1397
6c25a49e548a
upstream sendfile bit was overridden by r->connection->sendfile
Igor Sysoev <igor@sysoev.ru>
parents:
1378
diff
changeset
|
1573 c->sendfile &= r->connection->sendfile; |
| 1958 | 1574 u->output.sendfile = c->sendfile; |
| 479 | 1575 |
|
7306
8eab05b83dde
Upstream: fixed unexpected tcp_nopush usage on peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7297
diff
changeset
|
1576 if (r->connection->tcp_nopush == NGX_TCP_NOPUSH_DISABLED) { |
|
8eab05b83dde
Upstream: fixed unexpected tcp_nopush usage on peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7297
diff
changeset
|
1577 c->tcp_nopush = NGX_TCP_NOPUSH_DISABLED; |
|
8eab05b83dde
Upstream: fixed unexpected tcp_nopush usage on peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7297
diff
changeset
|
1578 } |
|
8eab05b83dde
Upstream: fixed unexpected tcp_nopush usage on peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7297
diff
changeset
|
1579 |
|
4116
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1580 if (c->pool == NULL) { |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1581 |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1582 /* 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
|
1583 |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1584 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
|
1585 if (c->pool == NULL) { |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1586 ngx_http_upstream_finalize_request(r, u, |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1587 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1588 return; |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1589 } |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1590 } |
|
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1591 |
| 2847 | 1592 c->log = r->connection->log; |
|
4116
9baf12ea5ca1
Upstream: separate pool for peer connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4115
diff
changeset
|
1593 c->pool->log = c->log; |
| 2847 | 1594 c->read->log = c->log; |
| 1595 c->write->log = c->log; | |
| 479 | 1596 |
| 1597 /* init or reinit the ngx_output_chain() and ngx_chain_writer() contexts */ | |
| 1598 | |
|
7949
862f6130d357
Upstream: sendfile_max_chunk support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7941
diff
changeset
|
1599 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
|
862f6130d357
Upstream: sendfile_max_chunk support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7941
diff
changeset
|
1600 |
| 479 | 1601 u->writer.out = NULL; |
| 1602 u->writer.last = &u->writer.out; | |
| 1603 u->writer.connection = c; | |
|
7949
862f6130d357
Upstream: sendfile_max_chunk support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7941
diff
changeset
|
1604 u->writer.limit = clcf->sendfile_max_chunk; |
| 479 | 1605 |
| 1606 if (u->request_sent) { | |
| 509 | 1607 if (ngx_http_upstream_reinit(r, u) != NGX_OK) { |
| 1608 ngx_http_upstream_finalize_request(r, u, | |
| 1609 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1610 return; | |
| 1611 } | |
| 479 | 1612 } |
| 1613 | |
|
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
|
1614 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
|
1615 && 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
|
1616 && 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
|
1617 && 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
|
1618 { |
| 573 | 1619 /* |
| 1620 * 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
|
1621 * the subrequests should allocate their own temporary bufs |
| 573 | 1622 */ |
| 1623 | |
| 1624 u->output.free = ngx_alloc_chain_link(r->pool); | |
| 1625 if (u->output.free == NULL) { | |
| 1626 ngx_http_upstream_finalize_request(r, u, | |
| 1627 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1628 return; | |
| 479 | 1629 } |
| 573 | 1630 |
| 1631 u->output.free->buf = r->request_body->buf; | |
| 1632 u->output.free->next = NULL; | |
| 1633 u->output.allocated = 1; | |
| 1634 | |
| 1635 r->request_body->buf->pos = r->request_body->buf->start; | |
| 1636 r->request_body->buf->last = r->request_body->buf->start; | |
| 1637 r->request_body->buf->tag = u->output.tag; | |
| 479 | 1638 } |
| 1639 | |
| 1640 u->request_sent = 0; | |
|
6332
78b4e10b4367
Upstream: don't keep connections on early responses (ticket #669).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6326
diff
changeset
|
1641 u->request_body_sent = 0; |
|
7231
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
1642 u->request_body_blocked = 0; |
| 479 | 1643 |
| 1644 if (rc == NGX_AGAIN) { | |
| 1645 ngx_add_timer(c->write, u->conf->connect_timeout); | |
| 1646 return; | |
| 1647 } | |
| 1648 | |
| 577 | 1649 #if (NGX_HTTP_SSL) |
| 1650 | |
| 1658 | 1651 if (u->ssl && c->ssl == NULL) { |
| 591 | 1652 ngx_http_upstream_ssl_init_connection(r, u, c); |
| 577 | 1653 return; |
| 1654 } | |
| 1655 | |
| 1656 #endif | |
| 1657 | |
|
6050
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
1658 ngx_http_upstream_send_request(r, u, 1); |
| 479 | 1659 } |
| 1660 | |
| 1661 | |
| 577 | 1662 #if (NGX_HTTP_SSL) |
| 1663 | |
| 1664 static void | |
| 591 | 1665 ngx_http_upstream_ssl_init_connection(ngx_http_request_t *r, |
| 1666 ngx_http_upstream_t *u, ngx_connection_t *c) | |
| 1667 { | |
|
6068
643f2ce02f1c
Upstream: abbreviated SSL handshake may interact badly with Nagle.
Ruslan Ermilov <ru@nginx.com>
parents:
6050
diff
changeset
|
1668 ngx_int_t rc; |
|
643f2ce02f1c
Upstream: abbreviated SSL handshake may interact badly with Nagle.
Ruslan Ermilov <ru@nginx.com>
parents:
6050
diff
changeset
|
1669 ngx_http_core_loc_conf_t *clcf; |
| 591 | 1670 |
|
5305
12b750d35162
Upstream: reliably detect connection failures with SSL peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5304
diff
changeset
|
1671 if (ngx_http_upstream_test_connect(c) != NGX_OK) { |
|
12b750d35162
Upstream: reliably detect connection failures with SSL peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5304
diff
changeset
|
1672 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); |
|
12b750d35162
Upstream: reliably detect connection failures with SSL peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5304
diff
changeset
|
1673 return; |
|
12b750d35162
Upstream: reliably detect connection failures with SSL peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5304
diff
changeset
|
1674 } |
|
12b750d35162
Upstream: reliably detect connection failures with SSL peers.
Ruslan Ermilov <ru@nginx.com>
parents:
5304
diff
changeset
|
1675 |
| 591 | 1676 if (ngx_ssl_create_connection(u->conf->ssl, c, |
| 1677 NGX_SSL_BUFFER|NGX_SSL_CLIENT) | |
|
2536
a6d6d762c554
small optimization: " == NGX_ERROR" > " != NGX_OK"
Igor Sysoev <igor@sysoev.ru>
parents:
2463
diff
changeset
|
1678 != NGX_OK) |
| 591 | 1679 { |
| 1680 ngx_http_upstream_finalize_request(r, u, | |
| 1681 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1682 return; | |
| 1683 } | |
| 1684 | |
|
5661
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1685 if (u->conf->ssl_server_name || u->conf->ssl_verify) { |
|
5660
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1686 if (ngx_http_upstream_ssl_name(r, u, c) != NGX_OK) { |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1687 ngx_http_upstream_finalize_request(r, u, |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1688 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1689 return; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1690 } |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1691 } |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1692 |
|
8042
c7e25324be11
Upstream: handling of certificates specified as an empty string.
Sergey Kandaurov <pluknet@nginx.com>
parents:
8041
diff
changeset
|
1693 if (u->conf->ssl_certificate |
|
c7e25324be11
Upstream: handling of certificates specified as an empty string.
Sergey Kandaurov <pluknet@nginx.com>
parents:
8041
diff
changeset
|
1694 && u->conf->ssl_certificate->value.len |
|
c7e25324be11
Upstream: handling of certificates specified as an empty string.
Sergey Kandaurov <pluknet@nginx.com>
parents:
8041
diff
changeset
|
1695 && (u->conf->ssl_certificate->lengths |
|
c7e25324be11
Upstream: handling of certificates specified as an empty string.
Sergey Kandaurov <pluknet@nginx.com>
parents:
8041
diff
changeset
|
1696 || u->conf->ssl_certificate_key->lengths)) |
|
7833
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1697 { |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1698 if (ngx_http_upstream_ssl_certificate(r, u, c) != NGX_OK) { |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1699 ngx_http_upstream_finalize_request(r, u, |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1700 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1701 return; |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1702 } |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1703 } |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1704 |
| 2184 | 1705 if (u->conf->ssl_session_reuse) { |
|
7320
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1706 c->ssl->save_session = ngx_http_upstream_ssl_save_session; |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1707 |
| 2184 | 1708 if (u->peer.set_session(&u->peer, u->peer.data) != NGX_OK) { |
| 1709 ngx_http_upstream_finalize_request(r, u, | |
| 1710 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 1711 return; | |
| 1712 } | |
|
6068
643f2ce02f1c
Upstream: abbreviated SSL handshake may interact badly with Nagle.
Ruslan Ermilov <ru@nginx.com>
parents:
6050
diff
changeset
|
1713 |
|
643f2ce02f1c
Upstream: abbreviated SSL handshake may interact badly with Nagle.
Ruslan Ermilov <ru@nginx.com>
parents:
6050
diff
changeset
|
1714 /* abbreviated SSL handshake may interact badly with Nagle */ |
|
643f2ce02f1c
Upstream: abbreviated SSL handshake may interact badly with Nagle.
Ruslan Ermilov <ru@nginx.com>
parents:
6050
diff
changeset
|
1715 |
|
643f2ce02f1c
Upstream: abbreviated SSL handshake may interact badly with Nagle.
Ruslan Ermilov <ru@nginx.com>
parents:
6050
diff
changeset
|
1716 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
|
643f2ce02f1c
Upstream: abbreviated SSL handshake may interact badly with Nagle.
Ruslan Ermilov <ru@nginx.com>
parents:
6050
diff
changeset
|
1717 |
|
7007
ed1101bbf19f
Introduced ngx_tcp_nodelay().
Ruslan Ermilov <ru@nginx.com>
parents:
7006
diff
changeset
|
1718 if (clcf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) { |
|
ed1101bbf19f
Introduced ngx_tcp_nodelay().
Ruslan Ermilov <ru@nginx.com>
parents:
7006
diff
changeset
|
1719 ngx_http_upstream_finalize_request(r, u, |
|
6068
643f2ce02f1c
Upstream: abbreviated SSL handshake may interact badly with Nagle.
Ruslan Ermilov <ru@nginx.com>
parents:
6050
diff
changeset
|
1720 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
7007
ed1101bbf19f
Introduced ngx_tcp_nodelay().
Ruslan Ermilov <ru@nginx.com>
parents:
7006
diff
changeset
|
1721 return; |
|
6068
643f2ce02f1c
Upstream: abbreviated SSL handshake may interact badly with Nagle.
Ruslan Ermilov <ru@nginx.com>
parents:
6050
diff
changeset
|
1722 } |
| 591 | 1723 } |
| 1724 | |
| 641 | 1725 r->connection->log->action = "SSL handshaking to upstream"; |
| 1726 | |
| 591 | 1727 rc = ngx_ssl_handshake(c); |
| 1728 | |
| 1729 if (rc == NGX_AGAIN) { | |
|
5774
9bf58a3da25b
Upstream: SSL handshake timeouts.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5770
diff
changeset
|
1730 |
|
9bf58a3da25b
Upstream: SSL handshake timeouts.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5770
diff
changeset
|
1731 if (!c->write->timer_set) { |
|
9bf58a3da25b
Upstream: SSL handshake timeouts.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5770
diff
changeset
|
1732 ngx_add_timer(c->write, u->conf->connect_timeout); |
|
9bf58a3da25b
Upstream: SSL handshake timeouts.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5770
diff
changeset
|
1733 } |
|
9bf58a3da25b
Upstream: SSL handshake timeouts.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5770
diff
changeset
|
1734 |
|
7042
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1735 c->ssl->handler = ngx_http_upstream_ssl_handshake_handler; |
| 591 | 1736 return; |
| 1737 } | |
| 1738 | |
|
7042
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1739 ngx_http_upstream_ssl_handshake(r, u, c); |
| 591 | 1740 } |
| 1741 | |
| 1742 | |
| 1743 static void | |
|
7042
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1744 ngx_http_upstream_ssl_handshake_handler(ngx_connection_t *c) |
| 577 | 1745 { |
| 1746 ngx_http_request_t *r; | |
| 1747 ngx_http_upstream_t *u; | |
| 1748 | |
| 1749 r = c->data; | |
|
7042
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1750 |
| 577 | 1751 u = r->upstream; |
|
7042
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1752 c = r->connection; |
| 577 | 1753 |
|
5928
8dfee01ff0bd
Upstream: improved subrequest logging.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5911
diff
changeset
|
1754 ngx_http_set_log_request(c->log, r); |
|
8dfee01ff0bd
Upstream: improved subrequest logging.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5911
diff
changeset
|
1755 |
|
7042
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1756 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, |
|
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1757 "http upstream ssl handshake: \"%V?%V\"", |
|
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1758 &r->uri, &r->args); |
|
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1759 |
|
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1760 ngx_http_upstream_ssl_handshake(r, u, u->peer.connection); |
|
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1761 |
|
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1762 ngx_http_run_posted_requests(c); |
|
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1763 } |
|
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1764 |
|
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1765 |
|
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1766 static void |
|
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1767 ngx_http_upstream_ssl_handshake(ngx_http_request_t *r, ngx_http_upstream_t *u, |
|
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1768 ngx_connection_t *c) |
|
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1769 { |
|
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1770 long rc; |
|
bd2f97a3aecc
Upstream: introduced ngx_http_upstream_ssl_handshake_handler().
Maxim Dounin <mdounin@mdounin.ru>
parents:
7041
diff
changeset
|
1771 |
| 577 | 1772 if (c->ssl->handshaked) { |
| 1773 | |
|
5661
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1774 if (u->conf->ssl_verify) { |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1775 rc = SSL_get_verify_result(c->ssl->connection); |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1776 |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1777 if (rc != X509_V_OK) { |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1778 ngx_log_error(NGX_LOG_ERR, c->log, 0, |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1779 "upstream SSL certificate verify error: (%l:%s)", |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1780 rc, X509_verify_cert_error_string(rc)); |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1781 goto failed; |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1782 } |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1783 |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1784 if (ngx_ssl_check_host(c, &u->ssl_name) != NGX_OK) { |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1785 ngx_log_error(NGX_LOG_ERR, c->log, 0, |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1786 "upstream SSL certificate does not match \"%V\"", |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1787 &u->ssl_name); |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1788 goto failed; |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1789 } |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1790 } |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1791 |
|
7941
65946a191197
SSL: SSL_sendfile() support with kernel TLS.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7906
diff
changeset
|
1792 if (!c->ssl->sendfile) { |
|
65946a191197
SSL: SSL_sendfile() support with kernel TLS.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7906
diff
changeset
|
1793 c->sendfile = 0; |
|
65946a191197
SSL: SSL_sendfile() support with kernel TLS.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7906
diff
changeset
|
1794 u->output.sendfile = 0; |
|
65946a191197
SSL: SSL_sendfile() support with kernel TLS.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7906
diff
changeset
|
1795 } |
|
65946a191197
SSL: SSL_sendfile() support with kernel TLS.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7906
diff
changeset
|
1796 |
|
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
1797 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
|
1798 c->read->handler = ngx_http_upstream_handler; |
| 577 | 1799 |
|
6050
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
1800 ngx_http_upstream_send_request(r, u, 1); |
| 577 | 1801 |
| 1802 return; | |
| 1803 } | |
| 1804 | |
|
6799
d8d037f20484
Upstream: handling of upstream SSL handshake timeouts.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6795
diff
changeset
|
1805 if (c->write->timedout) { |
|
d8d037f20484
Upstream: handling of upstream SSL handshake timeouts.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6795
diff
changeset
|
1806 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT); |
|
d8d037f20484
Upstream: handling of upstream SSL handshake timeouts.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6795
diff
changeset
|
1807 return; |
|
d8d037f20484
Upstream: handling of upstream SSL handshake timeouts.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6795
diff
changeset
|
1808 } |
|
d8d037f20484
Upstream: handling of upstream SSL handshake timeouts.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6795
diff
changeset
|
1809 |
|
5661
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1810 failed: |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1811 |
| 577 | 1812 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); |
| 1813 } | |
| 1814 | |
|
5660
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1815 |
|
7320
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1816 static void |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1817 ngx_http_upstream_ssl_save_session(ngx_connection_t *c) |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1818 { |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1819 ngx_http_request_t *r; |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1820 ngx_http_upstream_t *u; |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1821 |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1822 if (c->idle) { |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1823 return; |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1824 } |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1825 |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1826 r = c->data; |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1827 |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1828 u = r->upstream; |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1829 c = r->connection; |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1830 |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1831 ngx_http_set_log_request(c->log, r); |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1832 |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1833 u->peer.save_session(&u->peer, u->peer.data); |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1834 } |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1835 |
|
696df3ac27ac
SSL: save sessions for upstream peers using a callback function.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7307
diff
changeset
|
1836 |
|
5660
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1837 static ngx_int_t |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1838 ngx_http_upstream_ssl_name(ngx_http_request_t *r, ngx_http_upstream_t *u, |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1839 ngx_connection_t *c) |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1840 { |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1841 u_char *p, *last; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1842 ngx_str_t name; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1843 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1844 if (u->conf->ssl_name) { |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1845 if (ngx_http_complex_value(r, u->conf->ssl_name, &name) != NGX_OK) { |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1846 return NGX_ERROR; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1847 } |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1848 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1849 } else { |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1850 name = u->ssl_name; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1851 } |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1852 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1853 if (name.len == 0) { |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1854 goto done; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1855 } |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1856 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1857 /* |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1858 * ssl name here may contain port, notably if derived from $proxy_host |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1859 * or $http_host; we have to strip it |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1860 */ |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1861 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1862 p = name.data; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1863 last = name.data + name.len; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1864 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1865 if (*p == '[') { |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1866 p = ngx_strlchr(p, last, ']'); |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1867 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1868 if (p == NULL) { |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1869 p = name.data; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1870 } |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1871 } |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1872 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1873 p = ngx_strlchr(p, last, ':'); |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1874 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1875 if (p != NULL) { |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1876 name.len = p - name.data; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1877 } |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1878 |
|
5661
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1879 if (!u->conf->ssl_server_name) { |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1880 goto done; |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1881 } |
|
060c2e692b96
Upstream: proxy_ssl_verify and friends.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5660
diff
changeset
|
1882 |
|
5660
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1883 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1884 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1885 /* as per RFC 6066, literal IPv4 and IPv6 addresses are not permitted */ |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1886 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1887 if (name.len == 0 || *name.data == '[') { |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1888 goto done; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1889 } |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1890 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1891 if (ngx_inet_addr(name.data, name.len) != INADDR_NONE) { |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1892 goto done; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1893 } |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1894 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1895 /* |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1896 * SSL_set_tlsext_host_name() needs a null-terminated string, |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1897 * hence we explicitly null-terminate name here |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1898 */ |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1899 |
|
5667
16405e02e612
Upstream: for ssl name, non-aligned memory allocation is enough.
Ruslan Ermilov <ru@nginx.com>
parents:
5661
diff
changeset
|
1900 p = ngx_pnalloc(r->pool, name.len + 1); |
|
5660
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1901 if (p == NULL) { |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1902 return NGX_ERROR; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1903 } |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1904 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1905 (void) ngx_cpystrn(p, name.data, name.len + 1); |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1906 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1907 name.data = p; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1908 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1909 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1910 "upstream SSL server name: \"%s\"", name.data); |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1911 |
|
6777
563a1ee345a4
SSL: compatibility with BoringSSL.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6745
diff
changeset
|
1912 if (SSL_set_tlsext_host_name(c->ssl->connection, |
|
563a1ee345a4
SSL: compatibility with BoringSSL.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6745
diff
changeset
|
1913 (char *) name.data) |
|
563a1ee345a4
SSL: compatibility with BoringSSL.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6745
diff
changeset
|
1914 == 0) |
|
563a1ee345a4
SSL: compatibility with BoringSSL.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6745
diff
changeset
|
1915 { |
|
5660
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1916 ngx_ssl_error(NGX_LOG_ERR, r->connection->log, 0, |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1917 "SSL_set_tlsext_host_name(\"%s\") failed", name.data); |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1918 return NGX_ERROR; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1919 } |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1920 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1921 #endif |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1922 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1923 done: |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1924 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1925 u->ssl_name = name; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1926 |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1927 return NGX_OK; |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1928 } |
|
7022564a9e0e
Upstream: proxy_ssl_name and proxy_ssl_server_name directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5621
diff
changeset
|
1929 |
|
7833
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1930 |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1931 static ngx_int_t |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1932 ngx_http_upstream_ssl_certificate(ngx_http_request_t *r, |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1933 ngx_http_upstream_t *u, ngx_connection_t *c) |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1934 { |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1935 ngx_str_t cert, key; |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1936 |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1937 if (ngx_http_complex_value(r, u->conf->ssl_certificate, &cert) |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1938 != NGX_OK) |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1939 { |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1940 return NGX_ERROR; |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1941 } |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1942 |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1943 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1944 "http upstream ssl cert: \"%s\"", cert.data); |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1945 |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1946 if (*cert.data == '\0') { |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1947 return NGX_OK; |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1948 } |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1949 |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1950 if (ngx_http_complex_value(r, u->conf->ssl_certificate_key, &key) |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1951 != NGX_OK) |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1952 { |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1953 return NGX_ERROR; |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1954 } |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1955 |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1956 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1957 "http upstream ssl key: \"%s\"", key.data); |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1958 |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1959 if (ngx_ssl_connection_certificate(c, r->pool, &cert, &key, |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1960 u->conf->ssl_passwords) |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1961 != NGX_OK) |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1962 { |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1963 return NGX_ERROR; |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1964 } |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1965 |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1966 return NGX_OK; |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1967 } |
|
3ab8e1e2f0f7
Upstream: variables support in certificates.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7811
diff
changeset
|
1968 |
| 577 | 1969 #endif |
| 1970 | |
| 1971 | |
| 509 | 1972 static ngx_int_t |
| 487 | 1973 ngx_http_upstream_reinit(ngx_http_request_t *r, ngx_http_upstream_t *u) |
| 479 | 1974 { |
|
5848
106a8bfa4f42
Upstream: fixed file buffers reinit in ngx_http_upstream_reinit().
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
1975 off_t file_pos; |
| 479 | 1976 ngx_chain_t *cl; |
| 1977 | |
| 509 | 1978 if (u->reinit_request(r) != NGX_OK) { |
| 1979 return NGX_ERROR; | |
| 1980 } | |
| 1981 | |
|
4120
42135dd1f0ea
Upstream: keepalive flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4119
diff
changeset
|
1982 u->keepalive = 0; |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
1983 u->upgrade = 0; |
|
7679
05e42236e95b
FastCGI: protection from responses with wrong length.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7678
diff
changeset
|
1984 u->error = 0; |
|
4120
42135dd1f0ea
Upstream: keepalive flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4119
diff
changeset
|
1985 |
| 1705 | 1986 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
|
1987 u->headers_in.content_length_n = -1; |
|
5869
fd283aa92e04
Upstream: fix $upstream_cache_last_modified variable.
Piotr Sikora <piotr@cloudflare.com>
parents:
5848
diff
changeset
|
1988 u->headers_in.last_modified_time = -1; |
| 1705 | 1989 |
| 1990 if (ngx_list_init(&u->headers_in.headers, r->pool, 8, | |
| 591 | 1991 sizeof(ngx_table_elt_t)) |
| 1992 != NGX_OK) | |
| 509 | 1993 { |
| 1994 return NGX_ERROR; | |
| 479 | 1995 } |
| 1996 | |
|
7230
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
1997 if (ngx_list_init(&u->headers_in.trailers, r->pool, 2, |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
1998 sizeof(ngx_table_elt_t)) |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
1999 != NGX_OK) |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2000 { |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2001 return NGX_ERROR; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2002 } |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2003 |
| 479 | 2004 /* reinit the request chain */ |
| 577 | 2005 |
|
5848
106a8bfa4f42
Upstream: fixed file buffers reinit in ngx_http_upstream_reinit().
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
2006 file_pos = 0; |
|
106a8bfa4f42
Upstream: fixed file buffers reinit in ngx_http_upstream_reinit().
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
2007 |
| 509 | 2008 for (cl = u->request_bufs; cl; cl = cl->next) { |
| 479 | 2009 cl->buf->pos = cl->buf->start; |
|
5848
106a8bfa4f42
Upstream: fixed file buffers reinit in ngx_http_upstream_reinit().
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
2010 |
|
106a8bfa4f42
Upstream: fixed file buffers reinit in ngx_http_upstream_reinit().
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
2011 /* there is at most one file */ |
|
106a8bfa4f42
Upstream: fixed file buffers reinit in ngx_http_upstream_reinit().
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
2012 |
|
106a8bfa4f42
Upstream: fixed file buffers reinit in ngx_http_upstream_reinit().
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
2013 if (cl->buf->in_file) { |
|
106a8bfa4f42
Upstream: fixed file buffers reinit in ngx_http_upstream_reinit().
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
2014 cl->buf->file_pos = file_pos; |
|
106a8bfa4f42
Upstream: fixed file buffers reinit in ngx_http_upstream_reinit().
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
2015 file_pos = cl->buf->file_last; |
|
106a8bfa4f42
Upstream: fixed file buffers reinit in ngx_http_upstream_reinit().
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
2016 } |
| 479 | 2017 } |
| 2018 | |
| 509 | 2019 /* reinit the subrequest's ngx_output_chain() context */ |
| 2020 | |
| 573 | 2021 if (r->request_body && r->request_body->temp_file |
| 597 | 2022 && r != r->main && u->output.buf) |
| 573 | 2023 { |
| 2024 u->output.free = ngx_alloc_chain_link(r->pool); | |
| 2025 if (u->output.free == NULL) { | |
| 2026 return NGX_ERROR; | |
| 509 | 2027 } |
| 573 | 2028 |
| 2029 u->output.free->buf = u->output.buf; | |
| 2030 u->output.free->next = NULL; | |
| 2031 | |
| 2032 u->output.buf->pos = u->output.buf->start; | |
| 2033 u->output.buf->last = u->output.buf->start; | |
| 509 | 2034 } |
| 479 | 2035 |
| 2036 u->output.buf = NULL; | |
| 2037 u->output.in = NULL; | |
| 2038 u->output.busy = NULL; | |
| 577 | 2039 |
| 581 | 2040 /* reinit u->buffer */ |
| 577 | 2041 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2042 u->buffer.pos = u->buffer.start; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2043 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2044 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2045 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2046 if (r->cache) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2047 u->buffer.pos += r->cache->header_start; |
| 479 | 2048 } |
| 509 | 2049 |
| 479 | 2050 #endif |
| 2051 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2052 u->buffer.last = u->buffer.pos; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2053 |
| 509 | 2054 return NGX_OK; |
| 479 | 2055 } |
| 2056 | |
| 2057 | |
| 487 | 2058 static void |
|
6050
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2059 ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u, |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2060 ngx_uint_t do_write) |
| 479 | 2061 { |
|
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2062 ngx_int_t rc; |
| 483 | 2063 ngx_connection_t *c; |
| 577 | 2064 |
| 479 | 2065 c = u->peer.connection; |
| 2066 | |
| 2067 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, | |
| 2068 "http upstream send request"); | |
| 2069 | |
|
6147
74b6ef56ea56
Upstream: $upstream_connect_time.
Ruslan Ermilov <ru@nginx.com>
parents:
6146
diff
changeset
|
2070 if (u->state->connect_time == (ngx_msec_t) -1) { |
|
7397
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
2071 u->state->connect_time = ngx_current_msec - u->start_time; |
|
6147
74b6ef56ea56
Upstream: $upstream_connect_time.
Ruslan Ermilov <ru@nginx.com>
parents:
6146
diff
changeset
|
2072 } |
|
74b6ef56ea56
Upstream: $upstream_connect_time.
Ruslan Ermilov <ru@nginx.com>
parents:
6146
diff
changeset
|
2073 |
|
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2074 if (!u->request_sent && ngx_http_upstream_test_connect(c) != NGX_OK) { |
| 1166 | 2075 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
|
2076 return; |
| 479 | 2077 } |
| 2078 | |
| 483 | 2079 c->log->action = "sending request to upstream"; |
| 479 | 2080 |
|
6050
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2081 rc = ngx_http_upstream_send_request_body(r, u, do_write); |
| 479 | 2082 |
| 2083 if (rc == NGX_ERROR) { | |
| 2084 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); | |
| 2085 return; | |
| 2086 } | |
| 2087 | |
|
6050
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2088 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2089 ngx_http_upstream_finalize_request(r, u, rc); |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2090 return; |
| 479 | 2091 } |
| 2092 | |
| 2093 if (rc == NGX_AGAIN) { | |
|
7231
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2094 if (!c->write->ready || u->request_body_blocked) { |
|
6050
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2095 ngx_add_timer(c->write, u->conf->send_timeout); |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2096 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2097 } else if (c->write->timer_set) { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2098 ngx_del_timer(c->write); |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2099 } |
| 479 | 2100 |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2101 if (ngx_handle_write_event(c->write, u->conf->send_lowat) != NGX_OK) { |
| 479 | 2102 ngx_http_upstream_finalize_request(r, u, |
| 2103 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 2104 return; | |
| 2105 } | |
| 2106 | |
|
7307
ece9b5454b8a
Upstream: fixed tcp_nopush with gRPC.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7306
diff
changeset
|
2107 if (c->write->ready && c->tcp_nopush == NGX_TCP_NOPUSH_SET) { |
|
ece9b5454b8a
Upstream: fixed tcp_nopush with gRPC.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7306
diff
changeset
|
2108 if (ngx_tcp_push(c->fd) == -1) { |
|
ece9b5454b8a
Upstream: fixed tcp_nopush with gRPC.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7306
diff
changeset
|
2109 ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno, |
|
ece9b5454b8a
Upstream: fixed tcp_nopush with gRPC.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7306
diff
changeset
|
2110 ngx_tcp_push_n " failed"); |
|
ece9b5454b8a
Upstream: fixed tcp_nopush with gRPC.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7306
diff
changeset
|
2111 ngx_http_upstream_finalize_request(r, u, |
|
ece9b5454b8a
Upstream: fixed tcp_nopush with gRPC.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7306
diff
changeset
|
2112 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
ece9b5454b8a
Upstream: fixed tcp_nopush with gRPC.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7306
diff
changeset
|
2113 return; |
|
ece9b5454b8a
Upstream: fixed tcp_nopush with gRPC.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7306
diff
changeset
|
2114 } |
|
ece9b5454b8a
Upstream: fixed tcp_nopush with gRPC.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7306
diff
changeset
|
2115 |
|
ece9b5454b8a
Upstream: fixed tcp_nopush with gRPC.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7306
diff
changeset
|
2116 c->tcp_nopush = NGX_TCP_NOPUSH_UNSET; |
|
ece9b5454b8a
Upstream: fixed tcp_nopush with gRPC.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7306
diff
changeset
|
2117 } |
|
ece9b5454b8a
Upstream: fixed tcp_nopush with gRPC.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7306
diff
changeset
|
2118 |
|
7906
058a67435e83
Upstream: fixed timeouts with gRPC, SSL and select (ticket #2229).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7833
diff
changeset
|
2119 if (c->read->ready) { |
|
058a67435e83
Upstream: fixed timeouts with gRPC, SSL and select (ticket #2229).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7833
diff
changeset
|
2120 ngx_post_event(c->read, &ngx_posted_events); |
|
058a67435e83
Upstream: fixed timeouts with gRPC, SSL and select (ticket #2229).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7833
diff
changeset
|
2121 } |
|
058a67435e83
Upstream: fixed timeouts with gRPC, SSL and select (ticket #2229).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7833
diff
changeset
|
2122 |
| 479 | 2123 return; |
| 2124 } | |
| 2125 | |
| 2126 /* rc == NGX_OK */ | |
| 2127 | |
|
6050
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2128 if (c->write->timer_set) { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2129 ngx_del_timer(c->write); |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2130 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2131 |
| 479 | 2132 if (c->tcp_nopush == NGX_TCP_NOPUSH_SET) { |
|
7239
400a3412b1e3
Fixed checking ngx_tcp_push() and ngx_tcp_nopush() return values.
Ruslan Ermilov <ru@nginx.com>
parents:
7232
diff
changeset
|
2133 if (ngx_tcp_push(c->fd) == -1) { |
| 479 | 2134 ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno, |
| 2135 ngx_tcp_push_n " failed"); | |
| 2136 ngx_http_upstream_finalize_request(r, u, | |
| 2137 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 577 | 2138 return; |
| 479 | 2139 } |
| 2140 | |
| 2141 c->tcp_nopush = NGX_TCP_NOPUSH_UNSET; | |
| 2142 } | |
| 577 | 2143 |
|
7232
a7ed15573ae9
Upstream: u->conf->preserve_output flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7231
diff
changeset
|
2144 if (!u->conf->preserve_output) { |
|
a7ed15573ae9
Upstream: u->conf->preserve_output flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7231
diff
changeset
|
2145 u->write_event_handler = ngx_http_upstream_dummy_handler; |
|
a7ed15573ae9
Upstream: u->conf->preserve_output flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7231
diff
changeset
|
2146 } |
| 479 | 2147 |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2148 if (ngx_handle_write_event(c->write, 0) != NGX_OK) { |
| 479 | 2149 ngx_http_upstream_finalize_request(r, u, |
| 2150 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 2151 return; | |
| 2152 } | |
|
5745
9d3a9c45fc43
Upstream: fixed handling of write event after sending request.
Valentin Bartenev <vbart@nginx.com>
parents:
5738
diff
changeset
|
2153 |
|
7260
08f114ed5449
Upstream: fixed u->conf->preserve_output (ticket #1519).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7255
diff
changeset
|
2154 if (!u->request_body_sent) { |
|
08f114ed5449
Upstream: fixed u->conf->preserve_output (ticket #1519).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7255
diff
changeset
|
2155 u->request_body_sent = 1; |
|
08f114ed5449
Upstream: fixed u->conf->preserve_output (ticket #1519).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7255
diff
changeset
|
2156 |
|
08f114ed5449
Upstream: fixed u->conf->preserve_output (ticket #1519).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7255
diff
changeset
|
2157 if (u->header_sent) { |
|
08f114ed5449
Upstream: fixed u->conf->preserve_output (ticket #1519).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7255
diff
changeset
|
2158 return; |
|
08f114ed5449
Upstream: fixed u->conf->preserve_output (ticket #1519).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7255
diff
changeset
|
2159 } |
|
08f114ed5449
Upstream: fixed u->conf->preserve_output (ticket #1519).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7255
diff
changeset
|
2160 |
|
08f114ed5449
Upstream: fixed u->conf->preserve_output (ticket #1519).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7255
diff
changeset
|
2161 ngx_add_timer(c->read, u->conf->read_timeout); |
|
08f114ed5449
Upstream: fixed u->conf->preserve_output (ticket #1519).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7255
diff
changeset
|
2162 |
|
08f114ed5449
Upstream: fixed u->conf->preserve_output (ticket #1519).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7255
diff
changeset
|
2163 if (c->read->ready) { |
|
08f114ed5449
Upstream: fixed u->conf->preserve_output (ticket #1519).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7255
diff
changeset
|
2164 ngx_http_upstream_process_header(r, u); |
|
08f114ed5449
Upstream: fixed u->conf->preserve_output (ticket #1519).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7255
diff
changeset
|
2165 return; |
|
08f114ed5449
Upstream: fixed u->conf->preserve_output (ticket #1519).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7255
diff
changeset
|
2166 } |
|
5745
9d3a9c45fc43
Upstream: fixed handling of write event after sending request.
Valentin Bartenev <vbart@nginx.com>
parents:
5738
diff
changeset
|
2167 } |
| 479 | 2168 } |
| 2169 | |
| 2170 | |
|
6050
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2171 static ngx_int_t |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2172 ngx_http_upstream_send_request_body(ngx_http_request_t *r, |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2173 ngx_http_upstream_t *u, ngx_uint_t do_write) |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2174 { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2175 ngx_int_t rc; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2176 ngx_chain_t *out, *cl, *ln; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2177 ngx_connection_t *c; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2178 ngx_http_core_loc_conf_t *clcf; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2179 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2180 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2181 "http upstream send request body"); |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2182 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2183 if (!r->request_body_no_buffering) { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2184 |
| 6474 | 2185 /* buffered request body */ |
| 2186 | |
| 2187 if (!u->request_sent) { | |
| 2188 u->request_sent = 1; | |
| 2189 out = u->request_bufs; | |
| 2190 | |
| 2191 } else { | |
| 2192 out = NULL; | |
| 2193 } | |
| 2194 | |
|
7231
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2195 rc = ngx_output_chain(&u->output, out); |
|
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2196 |
|
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2197 if (rc == NGX_AGAIN) { |
|
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2198 u->request_body_blocked = 1; |
|
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2199 |
|
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2200 } else { |
|
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2201 u->request_body_blocked = 0; |
|
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2202 } |
|
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2203 |
|
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2204 return rc; |
|
6050
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2205 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2206 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2207 if (!u->request_sent) { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2208 u->request_sent = 1; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2209 out = u->request_bufs; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2210 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2211 if (r->request_body->bufs) { |
|
7341
15ea84e65d07
Upstream: fixed request chain traversal (ticket #1618).
Vladimir Homutov <vl@nginx.com>
parents:
7340
diff
changeset
|
2212 for (cl = out; cl->next; cl = cl->next) { /* void */ } |
|
6050
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2213 cl->next = r->request_body->bufs; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2214 r->request_body->bufs = NULL; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2215 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2216 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2217 c = u->peer.connection; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2218 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2219 |
|
7007
ed1101bbf19f
Introduced ngx_tcp_nodelay().
Ruslan Ermilov <ru@nginx.com>
parents:
7006
diff
changeset
|
2220 if (clcf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) { |
|
ed1101bbf19f
Introduced ngx_tcp_nodelay().
Ruslan Ermilov <ru@nginx.com>
parents:
7006
diff
changeset
|
2221 return NGX_ERROR; |
|
6050
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2222 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2223 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2224 r->read_event_handler = ngx_http_upstream_read_request_handler; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2225 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2226 } else { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2227 out = NULL; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2228 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2229 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2230 for ( ;; ) { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2231 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2232 if (do_write) { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2233 rc = ngx_output_chain(&u->output, out); |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2234 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2235 if (rc == NGX_ERROR) { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2236 return NGX_ERROR; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2237 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2238 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2239 while (out) { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2240 ln = out; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2241 out = out->next; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2242 ngx_free_chain(r->pool, ln); |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2243 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2244 |
|
7231
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2245 if (rc == NGX_AGAIN) { |
|
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2246 u->request_body_blocked = 1; |
|
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2247 |
|
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2248 } else { |
|
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2249 u->request_body_blocked = 0; |
|
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2250 } |
|
22f7bdbd96d3
Upstream: u->request_body_blocked flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7230
diff
changeset
|
2251 |
|
6050
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2252 if (rc == NGX_OK && !r->reading_body) { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2253 break; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2254 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2255 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2256 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2257 if (r->reading_body) { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2258 /* read client request body */ |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2259 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2260 rc = ngx_http_read_unbuffered_request_body(r); |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2261 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2262 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2263 return rc; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2264 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2265 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2266 out = r->request_body->bufs; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2267 r->request_body->bufs = NULL; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2268 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2269 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2270 /* stop if there is nothing to send */ |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2271 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2272 if (out == NULL) { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2273 rc = NGX_AGAIN; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2274 break; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2275 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2276 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2277 do_write = 1; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2278 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2279 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2280 if (!r->reading_body) { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2281 if (!u->store && !r->post_action && !u->conf->ignore_client_abort) { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2282 r->read_event_handler = |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2283 ngx_http_upstream_rd_check_broken_connection; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2284 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2285 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2286 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2287 return rc; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2288 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2289 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2290 |
| 487 | 2291 static void |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2292 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
|
2293 ngx_http_upstream_t *u) |
| 479 | 2294 { |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2295 ngx_connection_t *c; |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2296 |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2297 c = u->peer.connection; |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2298 |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2299 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 479 | 2300 "http upstream send request handler"); |
| 2301 | |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2302 if (c->write->timedout) { |
| 479 | 2303 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT); |
| 2304 return; | |
| 2305 } | |
| 2306 | |
| 591 | 2307 #if (NGX_HTTP_SSL) |
| 2308 | |
| 1658 | 2309 if (u->ssl && c->ssl == NULL) { |
| 591 | 2310 ngx_http_upstream_ssl_init_connection(r, u, c); |
| 2311 return; | |
| 2312 } | |
| 2313 | |
| 2314 #endif | |
| 2315 | |
|
7232
a7ed15573ae9
Upstream: u->conf->preserve_output flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7231
diff
changeset
|
2316 if (u->header_sent && !u->conf->preserve_output) { |
|
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
2317 u->write_event_handler = ngx_http_upstream_dummy_handler; |
| 651 | 2318 |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2319 (void) ngx_handle_write_event(c->write, 0); |
| 651 | 2320 |
| 2321 return; | |
| 2322 } | |
| 2323 | |
|
6050
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2324 ngx_http_upstream_send_request(r, u, 1); |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2325 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2326 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2327 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2328 static void |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2329 ngx_http_upstream_read_request_handler(ngx_http_request_t *r) |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2330 { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2331 ngx_connection_t *c; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2332 ngx_http_upstream_t *u; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2333 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2334 c = r->connection; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2335 u = r->upstream; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2336 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2337 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2338 "http upstream read request handler"); |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2339 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2340 if (c->read->timedout) { |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2341 c->timedout = 1; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2342 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_REQUEST_TIME_OUT); |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2343 return; |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2344 } |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2345 |
|
a08fad30aeac
Request body: unbuffered reading.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6031
diff
changeset
|
2346 ngx_http_upstream_send_request(r, u, 0); |
| 479 | 2347 } |
| 2348 | |
| 2349 | |
| 487 | 2350 static void |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2351 ngx_http_upstream_process_header(ngx_http_request_t *r, ngx_http_upstream_t *u) |
| 479 | 2352 { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2353 ssize_t n; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2354 ngx_int_t rc; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2355 ngx_connection_t *c; |
| 479 | 2356 |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2357 c = u->peer.connection; |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2358 |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2359 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, |
| 483 | 2360 "http upstream process header"); |
| 479 | 2361 |
| 483 | 2362 c->log->action = "reading response header from upstream"; |
| 479 | 2363 |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2364 if (c->read->timedout) { |
| 479 | 2365 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT); |
| 2366 return; | |
| 2367 } | |
| 577 | 2368 |
|
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2369 if (!u->request_sent && ngx_http_upstream_test_connect(c) != NGX_OK) { |
| 1166 | 2370 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
|
2371 return; |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2372 } |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2373 |
| 581 | 2374 if (u->buffer.start == NULL) { |
| 2375 u->buffer.start = ngx_palloc(r->pool, u->conf->buffer_size); | |
| 2376 if (u->buffer.start == NULL) { | |
| 479 | 2377 ngx_http_upstream_finalize_request(r, u, |
| 2378 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 2379 return; | |
| 2380 } | |
| 2381 | |
| 581 | 2382 u->buffer.pos = u->buffer.start; |
| 2383 u->buffer.last = u->buffer.start; | |
| 2384 u->buffer.end = u->buffer.start + u->conf->buffer_size; | |
| 2385 u->buffer.temporary = 1; | |
| 2386 | |
| 2387 u->buffer.tag = u->output.tag; | |
| 479 | 2388 |
| 1705 | 2389 if (ngx_list_init(&u->headers_in.headers, r->pool, 8, |
| 581 | 2390 sizeof(ngx_table_elt_t)) |
| 2391 != NGX_OK) | |
| 509 | 2392 { |
| 2393 ngx_http_upstream_finalize_request(r, u, | |
| 2394 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 2395 return; | |
| 2396 } | |
| 2397 | |
|
7230
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2398 if (ngx_list_init(&u->headers_in.trailers, r->pool, 2, |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2399 sizeof(ngx_table_elt_t)) |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2400 != NGX_OK) |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2401 { |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2402 ngx_http_upstream_finalize_request(r, u, |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2403 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2404 return; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2405 } |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2406 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2407 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2408 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2409 if (r->cache) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2410 u->buffer.pos += r->cache->header_start; |
| 581 | 2411 u->buffer.last = u->buffer.pos; |
| 479 | 2412 } |
| 2413 #endif | |
| 2414 } | |
| 2415 | |
|
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2416 for ( ;; ) { |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2417 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2418 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
|
2419 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2420 if (n == NGX_AGAIN) { |
| 479 | 2421 #if 0 |
|
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2422 ngx_add_timer(rev, u->read_timeout); |
| 479 | 2423 #endif |
| 2424 | |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2425 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
|
2426 ngx_http_upstream_finalize_request(r, u, |
| 479 | 2427 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2428 return; |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2429 } |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2430 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2431 return; |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2432 } |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2433 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2434 if (n == 0) { |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
2435 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
|
2436 "upstream prematurely closed connection"); |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2437 } |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2438 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2439 if (n == NGX_ERROR || n == 0) { |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2440 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); |
| 479 | 2441 return; |
| 2442 } | |
| 2443 | |
|
6654
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
2444 u->state->bytes_received += n; |
|
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
2445 |
|
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2446 u->buffer.last += n; |
| 479 | 2447 |
| 2448 #if 0 | |
|
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2449 u->valid_header_in = 0; |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2450 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2451 u->peer.cached = 0; |
| 479 | 2452 #endif |
| 2453 | |
|
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2454 rc = u->process_header(r); |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2455 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2456 if (rc == NGX_AGAIN) { |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2457 |
|
4460
6299d1c4dbb4
Upstream: fixed "too big header" check.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
2458 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
|
2459 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
|
2460 "upstream sent too big header"); |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2461 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2462 ngx_http_upstream_next(r, u, |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2463 NGX_HTTP_UPSTREAM_FT_INVALID_HEADER); |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2464 return; |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2465 } |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2466 |
|
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2467 continue; |
| 479 | 2468 } |
| 2469 | |
|
2360
64854406b1f9
read and process upstream header in cycle,
Igor Sysoev <igor@sysoev.ru>
parents:
2308
diff
changeset
|
2470 break; |
| 479 | 2471 } |
| 2472 | |
| 2473 if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) { | |
| 2474 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_INVALID_HEADER); | |
| 2475 return; | |
| 2476 } | |
| 2477 | |
|
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
|
2478 if (rc == NGX_ERROR) { |
| 479 | 2479 ngx_http_upstream_finalize_request(r, u, |
| 2480 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 2481 return; | |
| 2482 } | |
| 2483 | |
| 2484 /* rc == NGX_OK */ | |
| 2485 | |
|
7397
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
2486 u->state->header_time = ngx_current_msec - u->start_time; |
|
5964
0a198a517eaf
Upstream: $upstream_header_time variable.
Vladimir Homutov <vl@nginx.com>
parents:
5960
diff
changeset
|
2487 |
|
5209
07e515e65984
Upstream: allow to intercept responses with status 300.
Ruslan Ermilov <ru@nginx.com>
parents:
5169
diff
changeset
|
2488 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
|
2489 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2490 if (ngx_http_upstream_test_next(r, u) == NGX_OK) { |
| 509 | 2491 return; |
| 2492 } | |
| 2493 | |
|
2267
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2494 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
|
2495 return; |
| 487 | 2496 } |
| 2497 } | |
| 2498 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2499 if (ngx_http_upstream_process_headers(r, u) != NGX_OK) { |
| 515 | 2500 return; |
| 2501 } | |
| 2502 | |
|
7220
20f139e9ffa8
Generic subrequests in memory.
Roman Arutyunyan <arut@nginx.com>
parents:
7199
diff
changeset
|
2503 ngx_http_upstream_send_response(r, u); |
|
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2504 } |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2505 |
|
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2506 |
|
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2507 static ngx_int_t |
|
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2508 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
|
2509 { |
|
7255
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2510 ngx_msec_t timeout; |
|
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2511 ngx_uint_t status, mask; |
|
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2512 ngx_http_upstream_next_t *un; |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2513 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2514 status = u->headers_in.status_n; |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2515 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2516 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
|
2517 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2518 if (status != un->status) { |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2519 continue; |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2520 } |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2521 |
|
7255
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2522 timeout = u->conf->next_upstream_timeout; |
|
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2523 |
|
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2524 if (u->request_sent |
|
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2525 && (r->method & (NGX_HTTP_POST|NGX_HTTP_LOCK|NGX_HTTP_PATCH))) |
|
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2526 { |
|
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2527 mask = un->mask | NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT; |
|
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2528 |
|
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2529 } else { |
|
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2530 mask = un->mask; |
|
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2531 } |
|
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2532 |
|
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2533 if (u->peer.tries > 1 |
|
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2534 && ((u->conf->next_upstream & mask) == mask) |
|
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2535 && !(u->request_sent && r->request_body_no_buffering) |
|
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2536 && !(timeout && ngx_current_msec - u->peer.start_time >= timeout)) |
|
4db4fe3bdeda
Upstream: fixed ngx_http_upstream_test_next() conditions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7239
diff
changeset
|
2537 { |
|
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2538 ngx_http_upstream_next(r, u, un->mask); |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2539 return NGX_OK; |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2540 } |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2541 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2542 #if (NGX_HTTP_CACHE) |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2543 |
| 2952 | 2544 if (u->cache_status == NGX_HTTP_CACHE_EXPIRED |
|
7702
7015f26aef90
Cache: ignore stale-if-error for 4xx and 5xx codes.
Roman Arutyunyan <arut@nginx.com>
parents:
7679
diff
changeset
|
2545 && (u->conf->cache_use_stale & un->mask)) |
| 2952 | 2546 { |
|
2824
d106509491b5
fix building --without-http-cache
Igor Sysoev <igor@sysoev.ru>
parents:
2807
diff
changeset
|
2547 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
|
2548 |
|
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
2549 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
|
2550 |
|
7126
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2551 if (rc != NGX_OK) { |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2552 ngx_http_upstream_finalize_request(r, u, rc); |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2553 return NGX_OK; |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2554 } |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2555 |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2556 u->cache_status = NGX_HTTP_CACHE_STALE; |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2557 rc = ngx_http_upstream_cache_send(r, u); |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2558 |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2559 if (rc == NGX_DONE) { |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2560 return NGX_OK; |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2561 } |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2562 |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2563 if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) { |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2564 rc = NGX_HTTP_INTERNAL_SERVER_ERROR; |
|
2805
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
2565 } |
|
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
2566 |
|
60551422e150
reinit proxy/fastcgi header parser before ngx_http_upstream_cache_send()
Igor Sysoev <igor@sysoev.ru>
parents:
2804
diff
changeset
|
2567 ngx_http_upstream_finalize_request(r, u, rc); |
|
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2568 return NGX_OK; |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2569 } |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2570 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2571 #endif |
|
7649
3c8082c3f98a
Upstream: jump out of loop after matching the status code.
Jinhua Tan <312841925@qq.com>
parents:
7538
diff
changeset
|
2572 |
|
3c8082c3f98a
Upstream: jump out of loop after matching the status code.
Jinhua Tan <312841925@qq.com>
parents:
7538
diff
changeset
|
2573 break; |
|
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2574 } |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2575 |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2576 #if (NGX_HTTP_CACHE) |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2577 |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2578 if (status == NGX_HTTP_NOT_MODIFIED |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2579 && u->cache_status == NGX_HTTP_CACHE_EXPIRED |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2580 && u->conf->cache_revalidate) |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2581 { |
|
6905
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
2582 time_t now, valid, updating, error; |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2583 ngx_int_t rc; |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2584 |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2585 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2586 "http upstream not modified"); |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2587 |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2588 now = ngx_time(); |
|
6905
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
2589 |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2590 valid = r->cache->valid_sec; |
|
6905
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
2591 updating = r->cache->updating_sec; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
2592 error = r->cache->error_sec; |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2593 |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2594 rc = u->reinit_request(r); |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2595 |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2596 if (rc != NGX_OK) { |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2597 ngx_http_upstream_finalize_request(r, u, rc); |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2598 return NGX_OK; |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2599 } |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2600 |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2601 u->cache_status = NGX_HTTP_CACHE_REVALIDATED; |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2602 rc = ngx_http_upstream_cache_send(r, u); |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2603 |
|
7126
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2604 if (rc == NGX_DONE) { |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2605 return NGX_OK; |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2606 } |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2607 |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2608 if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) { |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2609 rc = NGX_HTTP_INTERNAL_SERVER_ERROR; |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2610 } |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
2611 |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2612 if (valid == 0) { |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2613 valid = r->cache->valid_sec; |
|
6905
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
2614 updating = r->cache->updating_sec; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
2615 error = r->cache->error_sec; |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2616 } |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2617 |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2618 if (valid == 0) { |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2619 valid = ngx_http_file_cache_valid(u->conf->cache_valid, |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2620 u->headers_in.status_n); |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2621 if (valid) { |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2622 valid = now + valid; |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2623 } |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2624 } |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2625 |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2626 if (valid) { |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2627 r->cache->valid_sec = valid; |
|
6905
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
2628 r->cache->updating_sec = updating; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
2629 r->cache->error_sec = error; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
2630 |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2631 r->cache->date = now; |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2632 |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2633 ngx_http_file_cache_update_header(r); |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2634 } |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2635 |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2636 ngx_http_upstream_finalize_request(r, u, rc); |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2637 return NGX_OK; |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2638 } |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2639 |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2640 #endif |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
2641 |
|
2268
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2642 return NGX_DECLINED; |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2643 } |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2644 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2645 |
|
33556140681a
*) ngx_http_upstream_test_next()
Igor Sysoev <igor@sysoev.ru>
parents:
2267
diff
changeset
|
2646 static ngx_int_t |
|
2267
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2647 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
|
2648 ngx_http_upstream_t *u) |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2649 { |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2650 ngx_int_t status; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2651 ngx_uint_t i; |
|
8036
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2652 ngx_table_elt_t *h, *ho, **ph; |
|
2267
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2653 ngx_http_err_page_t *err_page; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2654 ngx_http_core_loc_conf_t *clcf; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2655 |
|
2441
0c117a89f399
in miss case memcached module returned END instead of default 404 page body
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
2656 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
|
2657 |
|
0c117a89f399
in miss case memcached module returned END instead of default 404 page body
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
2658 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
|
2659 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
|
2660 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
|
2661 } |
|
0c117a89f399
in miss case memcached module returned END instead of default 404 page body
Igor Sysoev <igor@sysoev.ru>
parents:
2422
diff
changeset
|
2662 |
|
2267
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2663 if (!u->conf->intercept_errors) { |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2664 return NGX_DECLINED; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2665 } |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2666 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2667 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
|
2668 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2669 if (clcf->error_pages == NULL) { |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2670 return NGX_DECLINED; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2671 } |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2672 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2673 err_page = clcf->error_pages->elts; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2674 for (i = 0; i < clcf->error_pages->nelts; i++) { |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2675 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2676 if (err_page[i].status == status) { |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2677 |
|
2953
aa12525236da
fix segfault if there is error_page 401, proxy_intercept_errors is on
Igor Sysoev <igor@sysoev.ru>
parents:
2952
diff
changeset
|
2678 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
|
2679 && 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
|
2680 { |
|
8036
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2681 h = u->headers_in.www_authenticate; |
|
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2682 ph = &r->headers_out.www_authenticate; |
|
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2683 |
|
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2684 while (h) { |
|
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2685 ho = ngx_list_push(&r->headers_out.headers); |
|
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2686 |
|
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2687 if (ho == NULL) { |
|
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2688 ngx_http_upstream_finalize_request(r, u, |
|
2267
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2689 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
8036
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2690 return NGX_OK; |
|
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2691 } |
|
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2692 |
|
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2693 *ho = *h; |
|
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2694 ho->next = NULL; |
|
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2695 |
|
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2696 *ph = ho; |
|
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2697 ph = &ho->next; |
|
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2698 |
|
f739c8142fb2
Upstream: multiple WWW-Authenticate headers (ticket #485).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8035
diff
changeset
|
2699 h = h->next; |
|
2267
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2700 } |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2701 } |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2702 |
|
3706
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
2703 #if (NGX_HTTP_CACHE) |
|
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
2704 |
|
3709
64777690c697
fix r3707: cache node should be freed be a response is not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3708
diff
changeset
|
2705 if (r->cache) { |
|
7117
dbd77a638eb7
Cache: fixed caching of intercepted errors (ticket #1382).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7116
diff
changeset
|
2706 |
|
8041
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
2707 if (u->headers_in.no_cache || u->headers_in.expired) { |
|
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
2708 u->cacheable = 0; |
|
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
2709 } |
|
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
2710 |
|
7117
dbd77a638eb7
Cache: fixed caching of intercepted errors (ticket #1382).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7116
diff
changeset
|
2711 if (u->cacheable) { |
|
dbd77a638eb7
Cache: fixed caching of intercepted errors (ticket #1382).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7116
diff
changeset
|
2712 time_t valid; |
|
dbd77a638eb7
Cache: fixed caching of intercepted errors (ticket #1382).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7116
diff
changeset
|
2713 |
|
dbd77a638eb7
Cache: fixed caching of intercepted errors (ticket #1382).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7116
diff
changeset
|
2714 valid = r->cache->valid_sec; |
|
dbd77a638eb7
Cache: fixed caching of intercepted errors (ticket #1382).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7116
diff
changeset
|
2715 |
|
dbd77a638eb7
Cache: fixed caching of intercepted errors (ticket #1382).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7116
diff
changeset
|
2716 if (valid == 0) { |
|
dbd77a638eb7
Cache: fixed caching of intercepted errors (ticket #1382).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7116
diff
changeset
|
2717 valid = ngx_http_file_cache_valid(u->conf->cache_valid, |
|
dbd77a638eb7
Cache: fixed caching of intercepted errors (ticket #1382).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7116
diff
changeset
|
2718 status); |
|
dbd77a638eb7
Cache: fixed caching of intercepted errors (ticket #1382).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7116
diff
changeset
|
2719 if (valid) { |
|
dbd77a638eb7
Cache: fixed caching of intercepted errors (ticket #1382).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7116
diff
changeset
|
2720 r->cache->valid_sec = ngx_time() + valid; |
|
dbd77a638eb7
Cache: fixed caching of intercepted errors (ticket #1382).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7116
diff
changeset
|
2721 } |
|
dbd77a638eb7
Cache: fixed caching of intercepted errors (ticket #1382).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7116
diff
changeset
|
2722 } |
|
dbd77a638eb7
Cache: fixed caching of intercepted errors (ticket #1382).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7116
diff
changeset
|
2723 |
|
dbd77a638eb7
Cache: fixed caching of intercepted errors (ticket #1382).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7116
diff
changeset
|
2724 if (valid) { |
|
dbd77a638eb7
Cache: fixed caching of intercepted errors (ticket #1382).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7116
diff
changeset
|
2725 r->cache->error = status; |
|
dbd77a638eb7
Cache: fixed caching of intercepted errors (ticket #1382).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7116
diff
changeset
|
2726 } |
|
3706
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
2727 } |
|
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
2728 |
|
3711
ce6ba077c270
several changes in cache cleanup handling:
Igor Sysoev <igor@sysoev.ru>
parents:
3709
diff
changeset
|
2729 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
|
2730 } |
|
ea908f6ae499
an intercepted error code was not cached
Igor Sysoev <igor@sysoev.ru>
parents:
3705
diff
changeset
|
2731 #endif |
|
2267
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2732 ngx_http_upstream_finalize_request(r, u, status); |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2733 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2734 return NGX_OK; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2735 } |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2736 } |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2737 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2738 return NGX_DECLINED; |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2739 } |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2740 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2741 |
|
920be89a3d2d
ngx_http_upstream_intercept_errors()
Igor Sysoev <igor@sysoev.ru>
parents:
2244
diff
changeset
|
2742 static ngx_int_t |
|
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2743 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
|
2744 { |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2745 int err; |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2746 socklen_t len; |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2747 |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2748 #if (NGX_HAVE_KQUEUE) |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2749 |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2750 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
|
2751 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
|
2752 if (c->write->pending_eof) { |
|
e62219793beb
Upstream: better detection of connect() failures with kqueue.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4895
diff
changeset
|
2753 err = c->write->kq_errno; |
|
e62219793beb
Upstream: better detection of connect() failures with kqueue.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4895
diff
changeset
|
2754 |
|
e62219793beb
Upstream: better detection of connect() failures with kqueue.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4895
diff
changeset
|
2755 } else { |
|
e62219793beb
Upstream: better detection of connect() failures with kqueue.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4895
diff
changeset
|
2756 err = c->read->kq_errno; |
|
e62219793beb
Upstream: better detection of connect() failures with kqueue.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4895
diff
changeset
|
2757 } |
|
e62219793beb
Upstream: better detection of connect() failures with kqueue.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4895
diff
changeset
|
2758 |
|
1469
0a269c464eaf
connection error should be logged with "connecting to upstream" action,
Igor Sysoev <igor@sysoev.ru>
parents:
1468
diff
changeset
|
2759 c->log->action = "connecting to upstream"; |
|
4916
79c8e87b1fcb
Trailing whitespace fix.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4915
diff
changeset
|
2760 (void) ngx_connection_error(c, err, |
| 1166 | 2761 "kevent() reported that connect() failed"); |
| 2762 return NGX_ERROR; | |
| 2763 } | |
|
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2764 |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2765 } else |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2766 #endif |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2767 { |
| 1166 | 2768 err = 0; |
| 2769 len = sizeof(int); | |
| 2770 | |
| 2771 /* | |
| 2772 * BSDs and Linux return 0 and set a pending error in err | |
| 2773 * Solaris returns -1 and sets errno | |
| 2774 */ | |
| 2775 | |
| 2776 if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, (void *) &err, &len) | |
| 2777 == -1) | |
| 2778 { | |
|
5557
188481078faf
Use ngx_socket_errno where appropriate.
Piotr Sikora <piotr@cloudflare.com>
parents:
5546
diff
changeset
|
2779 err = ngx_socket_errno; |
| 1166 | 2780 } |
| 2781 | |
| 2782 if (err) { | |
|
1469
0a269c464eaf
connection error should be logged with "connecting to upstream" action,
Igor Sysoev <igor@sysoev.ru>
parents:
1468
diff
changeset
|
2783 c->log->action = "connecting to upstream"; |
| 1166 | 2784 (void) ngx_connection_error(c, err, "connect() failed"); |
| 2785 return NGX_ERROR; | |
| 2786 } | |
|
1153
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2787 } |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2788 |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2789 return NGX_OK; |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2790 } |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2791 |
|
c843f3df3b85
separate ngx_http_upstream_test_connect() and
Igor Sysoev <igor@sysoev.ru>
parents:
1143
diff
changeset
|
2792 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2793 static ngx_int_t |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2794 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
|
2795 { |
|
5489
6d357b2a9d6e
Upstream: keep $upstream_http_x_accel_redirect intact.
Ruslan Ermilov <ru@nginx.com>
parents:
5477
diff
changeset
|
2796 ngx_str_t uri, args; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2797 ngx_uint_t i, flags; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2798 ngx_list_part_t *part; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2799 ngx_table_elt_t *h; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2800 ngx_http_upstream_header_t *hh; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2801 ngx_http_upstream_main_conf_t *umcf; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2802 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2803 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
|
2804 |
|
8041
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
2805 if (u->headers_in.no_cache || u->headers_in.expired) { |
|
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
2806 u->cacheable = 0; |
|
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
2807 } |
|
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
2808 |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
2809 if (u->headers_in.x_accel_redirect |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
2810 && !(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
|
2811 { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2812 ngx_http_upstream_finalize_request(r, u, NGX_DECLINED); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2813 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2814 part = &u->headers_in.headers.part; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2815 h = part->elts; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2816 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2817 for (i = 0; /* void */; i++) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2818 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2819 if (i >= part->nelts) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2820 if (part->next == NULL) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2821 break; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2822 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2823 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2824 part = part->next; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2825 h = part->elts; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2826 i = 0; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2827 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2828 |
|
8034
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
2829 if (h[i].hash == 0) { |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
2830 continue; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
2831 } |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
2832 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2833 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
|
2834 h[i].lowcase_key, h[i].key.len); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2835 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2836 if (hh && hh->redirect) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2837 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
|
2838 ngx_http_finalize_request(r, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2839 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2840 return NGX_DONE; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2841 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2842 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2843 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2844 |
|
5489
6d357b2a9d6e
Upstream: keep $upstream_http_x_accel_redirect intact.
Ruslan Ermilov <ru@nginx.com>
parents:
5477
diff
changeset
|
2845 uri = u->headers_in.x_accel_redirect->value; |
|
5901
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2846 |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2847 if (uri.data[0] == '@') { |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2848 ngx_http_named_location(r, &uri); |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2849 |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2850 } else { |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2851 ngx_str_null(&args); |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2852 flags = NGX_HTTP_LOG_UNSAFE; |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2853 |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2854 if (ngx_http_parse_unsafe_uri(r, &uri, &args, &flags) != NGX_OK) { |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2855 ngx_http_finalize_request(r, NGX_HTTP_NOT_FOUND); |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2856 return NGX_DONE; |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2857 } |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2858 |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2859 if (r->method != NGX_HTTP_HEAD) { |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2860 r->method = NGX_HTTP_GET; |
|
6334
b31928ca3870
Upstream: fixed changing method on X-Accel-Redirect.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6332
diff
changeset
|
2861 r->method_name = ngx_http_core_get_method; |
|
5901
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2862 } |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2863 |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2864 ngx_http_internal_redirect(r, &uri, &args); |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2865 } |
|
7d7eac6e31df
Upstream: support named location for X-Accel-Redirect.
Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
parents:
5885
diff
changeset
|
2866 |
|
3120
40b8b398dbbc
fix request counter for X-Accel-Redirect, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3112
diff
changeset
|
2867 ngx_http_finalize_request(r, NGX_DONE); |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2868 return NGX_DONE; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2869 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2870 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2871 part = &u->headers_in.headers.part; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2872 h = part->elts; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2873 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2874 for (i = 0; /* void */; i++) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2875 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2876 if (i >= part->nelts) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2877 if (part->next == NULL) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2878 break; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2879 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2880 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2881 part = part->next; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2882 h = part->elts; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2883 i = 0; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2884 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2885 |
|
8034
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
2886 if (h[i].hash == 0) { |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
2887 continue; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
2888 } |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
2889 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2890 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
|
2891 h[i].lowcase_key, h[i].key.len)) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2892 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2893 continue; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2894 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2895 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2896 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
|
2897 h[i].lowcase_key, h[i].key.len); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2898 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2899 if (hh) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2900 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
|
2901 ngx_http_upstream_finalize_request(r, u, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2902 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2903 return NGX_DONE; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2904 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2905 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2906 continue; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2907 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2908 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2909 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
|
2910 ngx_http_upstream_finalize_request(r, u, |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2911 NGX_HTTP_INTERNAL_SERVER_ERROR); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2912 return NGX_DONE; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2913 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2914 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2915 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2916 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
|
2917 r->headers_out.server->hash = 0; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2918 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2919 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2920 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
|
2921 r->headers_out.date->hash = 0; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2922 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2923 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2924 r->headers_out.status = u->headers_in.status_n; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2925 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
|
2926 |
|
4117
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
2927 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
|
2928 |
|
5735
5fb1e57c758a
Entity tags: explicit flag to skip not modified filter.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5732
diff
changeset
|
2929 r->disable_not_modified = !u->cacheable; |
|
5fb1e57c758a
Entity tags: explicit flag to skip not modified filter.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5732
diff
changeset
|
2930 |
|
5874
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5869
diff
changeset
|
2931 if (u->conf->force_ranges) { |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5869
diff
changeset
|
2932 r->allow_ranges = 1; |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5869
diff
changeset
|
2933 r->single_range = 1; |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5869
diff
changeset
|
2934 |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5869
diff
changeset
|
2935 #if (NGX_HTTP_CACHE) |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5869
diff
changeset
|
2936 if (r->cached) { |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5869
diff
changeset
|
2937 r->single_range = 0; |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5869
diff
changeset
|
2938 } |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5869
diff
changeset
|
2939 #endif |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5869
diff
changeset
|
2940 } |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5869
diff
changeset
|
2941 |
|
5300
f538a67c9f77
Upstream: u->length now defaults to -1 (API change).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5299
diff
changeset
|
2942 u->length = -1; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2943 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2944 return NGX_OK; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2945 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2946 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
2947 |
|
7230
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2948 static ngx_int_t |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2949 ngx_http_upstream_process_trailers(ngx_http_request_t *r, |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2950 ngx_http_upstream_t *u) |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2951 { |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2952 ngx_uint_t i; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2953 ngx_list_part_t *part; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2954 ngx_table_elt_t *h, *ho; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2955 |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2956 if (!u->conf->pass_trailers) { |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2957 return NGX_OK; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2958 } |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2959 |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2960 part = &u->headers_in.trailers.part; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2961 h = part->elts; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2962 |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2963 for (i = 0; /* void */; i++) { |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2964 |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2965 if (i >= part->nelts) { |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2966 if (part->next == NULL) { |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2967 break; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2968 } |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2969 |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2970 part = part->next; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2971 h = part->elts; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2972 i = 0; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2973 } |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2974 |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2975 if (ngx_hash_find(&u->conf->hide_headers_hash, h[i].hash, |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2976 h[i].lowcase_key, h[i].key.len)) |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2977 { |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2978 continue; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2979 } |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2980 |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2981 ho = ngx_list_push(&r->headers_out.trailers); |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2982 if (ho == NULL) { |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2983 return NGX_ERROR; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2984 } |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2985 |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2986 *ho = h[i]; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2987 } |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2988 |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2989 return NGX_OK; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2990 } |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2991 |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
2992 |
|
777
4ab852b691f5
<!--#include virtual=... set=... -->
Igor Sysoev <igor@sysoev.ru>
parents:
757
diff
changeset
|
2993 static void |
| 681 | 2994 ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u) |
| 2995 { | |
| 2402 | 2996 ssize_t n; |
| 681 | 2997 ngx_int_t rc; |
| 2998 ngx_event_pipe_t *p; | |
| 2999 ngx_connection_t *c; | |
| 3000 ngx_http_core_loc_conf_t *clcf; | |
| 3001 | |
| 509 | 3002 rc = ngx_http_send_header(r); |
| 479 | 3003 |
| 2701 | 3004 if (rc == NGX_ERROR || rc > NGX_OK || r->post_action) { |
| 485 | 3005 ngx_http_upstream_finalize_request(r, u, rc); |
| 479 | 3006 return; |
| 3007 } | |
| 3008 | |
|
5353
1608b1135a1d
Upstream: setting u->header_sent before ngx_http_upstream_upgrade().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5340
diff
changeset
|
3009 u->header_sent = 1; |
|
1608b1135a1d
Upstream: setting u->header_sent before ngx_http_upstream_upgrade().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5340
diff
changeset
|
3010 |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3011 if (u->upgrade) { |
|
6794
93b294c5d581
Upstream: avoid holding a cache node with upgraded connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6793
diff
changeset
|
3012 |
|
93b294c5d581
Upstream: avoid holding a cache node with upgraded connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6793
diff
changeset
|
3013 #if (NGX_HTTP_CACHE) |
|
93b294c5d581
Upstream: avoid holding a cache node with upgraded connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6793
diff
changeset
|
3014 |
|
93b294c5d581
Upstream: avoid holding a cache node with upgraded connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6793
diff
changeset
|
3015 if (r->cache) { |
|
93b294c5d581
Upstream: avoid holding a cache node with upgraded connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6793
diff
changeset
|
3016 ngx_http_file_cache_free(r->cache, u->pipe->temp_file); |
|
93b294c5d581
Upstream: avoid holding a cache node with upgraded connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6793
diff
changeset
|
3017 } |
|
93b294c5d581
Upstream: avoid holding a cache node with upgraded connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6793
diff
changeset
|
3018 |
|
93b294c5d581
Upstream: avoid holding a cache node with upgraded connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6793
diff
changeset
|
3019 #endif |
|
93b294c5d581
Upstream: avoid holding a cache node with upgraded connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6793
diff
changeset
|
3020 |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3021 ngx_http_upstream_upgrade(r, u); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3022 return; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3023 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3024 |
|
2704
ac1e2e199c9f
shutdown client connection for cacheable header only responses
Igor Sysoev <igor@sysoev.ru>
parents:
2703
diff
changeset
|
3025 c = r->connection; |
|
ac1e2e199c9f
shutdown client connection for cacheable header only responses
Igor Sysoev <igor@sysoev.ru>
parents:
2703
diff
changeset
|
3026 |
| 2701 | 3027 if (r->header_only) { |
|
2704
ac1e2e199c9f
shutdown client connection for cacheable header only responses
Igor Sysoev <igor@sysoev.ru>
parents:
2703
diff
changeset
|
3028 |
|
5746
35990c69b3ac
Upstream: p->downstream_error instead of closing connection.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5745
diff
changeset
|
3029 if (!u->buffering) { |
| 2701 | 3030 ngx_http_upstream_finalize_request(r, u, rc); |
| 3031 return; | |
| 3032 } | |
|
5746
35990c69b3ac
Upstream: p->downstream_error instead of closing connection.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5745
diff
changeset
|
3033 |
|
35990c69b3ac
Upstream: p->downstream_error instead of closing connection.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5745
diff
changeset
|
3034 if (!u->cacheable && !u->store) { |
|
35990c69b3ac
Upstream: p->downstream_error instead of closing connection.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5745
diff
changeset
|
3035 ngx_http_upstream_finalize_request(r, u, rc); |
|
35990c69b3ac
Upstream: p->downstream_error instead of closing connection.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5745
diff
changeset
|
3036 return; |
|
35990c69b3ac
Upstream: p->downstream_error instead of closing connection.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5745
diff
changeset
|
3037 } |
|
35990c69b3ac
Upstream: p->downstream_error instead of closing connection.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5745
diff
changeset
|
3038 |
|
35990c69b3ac
Upstream: p->downstream_error instead of closing connection.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5745
diff
changeset
|
3039 u->pipe->downstream_error = 1; |
| 2701 | 3040 } |
| 3041 | |
|
7070
f583559aadc7
Upstream: keep request body file from removal if requested.
Roman Arutyunyan <arut@nginx.com>
parents:
7067
diff
changeset
|
3042 if (r->request_body && r->request_body->temp_file |
|
7297
a10e5fe44762
Upstream: disable body cleanup with preserve_output (ticket #1565).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7260
diff
changeset
|
3043 && r == r->main && !r->preserve_body |
|
a10e5fe44762
Upstream: disable body cleanup with preserve_output (ticket #1565).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7260
diff
changeset
|
3044 && !u->conf->preserve_output) |
|
7070
f583559aadc7
Upstream: keep request body file from removal if requested.
Roman Arutyunyan <arut@nginx.com>
parents:
7067
diff
changeset
|
3045 { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3046 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
|
3047 r->request_body->temp_file->file.fd = NGX_INVALID_FILE; |
| 563 | 3048 } |
| 3049 | |
| 581 | 3050 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
| 3051 | |
| 649 | 3052 if (!u->buffering) { |
| 581 | 3053 |
|
6794
93b294c5d581
Upstream: avoid holding a cache node with upgraded connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6793
diff
changeset
|
3054 #if (NGX_HTTP_CACHE) |
|
93b294c5d581
Upstream: avoid holding a cache node with upgraded connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6793
diff
changeset
|
3055 |
|
93b294c5d581
Upstream: avoid holding a cache node with upgraded connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6793
diff
changeset
|
3056 if (r->cache) { |
|
93b294c5d581
Upstream: avoid holding a cache node with upgraded connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6793
diff
changeset
|
3057 ngx_http_file_cache_free(r->cache, u->pipe->temp_file); |
|
93b294c5d581
Upstream: avoid holding a cache node with upgraded connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6793
diff
changeset
|
3058 } |
|
93b294c5d581
Upstream: avoid holding a cache node with upgraded connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6793
diff
changeset
|
3059 |
|
93b294c5d581
Upstream: avoid holding a cache node with upgraded connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6793
diff
changeset
|
3060 #endif |
|
93b294c5d581
Upstream: avoid holding a cache node with upgraded connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6793
diff
changeset
|
3061 |
| 581 | 3062 if (u->input_filter == NULL) { |
| 3063 u->input_filter_init = ngx_http_upstream_non_buffered_filter_init; | |
| 3064 u->input_filter = ngx_http_upstream_non_buffered_filter; | |
| 3065 u->input_filter_ctx = r; | |
| 3066 } | |
| 3067 | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3068 u->read_event_handler = ngx_http_upstream_process_non_buffered_upstream; |
| 581 | 3069 r->write_event_handler = |
| 3070 ngx_http_upstream_process_non_buffered_downstream; | |
| 3071 | |
| 3072 r->limit_rate = 0; | |
|
7504
c19ca381b2e6
Variables support in limit_rate and limit_rate_after (ticket #293).
Ruslan Ermilov <ru@nginx.com>
parents:
7456
diff
changeset
|
3073 r->limit_rate_set = 1; |
| 581 | 3074 |
| 3075 if (u->input_filter_init(u->input_filter_ctx) == NGX_ERROR) { | |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3076 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
| 581 | 3077 return; |
| 3078 } | |
| 3079 | |
|
7007
ed1101bbf19f
Introduced ngx_tcp_nodelay().
Ruslan Ermilov <ru@nginx.com>
parents:
7006
diff
changeset
|
3080 if (clcf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) { |
|
ed1101bbf19f
Introduced ngx_tcp_nodelay().
Ruslan Ermilov <ru@nginx.com>
parents:
7006
diff
changeset
|
3081 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
ed1101bbf19f
Introduced ngx_tcp_nodelay().
Ruslan Ermilov <ru@nginx.com>
parents:
7006
diff
changeset
|
3082 return; |
| 583 | 3083 } |
| 3084 | |
| 2402 | 3085 n = u->buffer.last - u->buffer.pos; |
| 3086 | |
| 3087 if (n) { | |
| 581 | 3088 u->buffer.last = u->buffer.pos; |
| 3089 | |
| 2402 | 3090 u->state->response_length += n; |
| 3091 | |
| 3092 if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) { | |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3093 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
| 581 | 3094 return; |
| 3095 } | |
| 3096 | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3097 ngx_http_upstream_process_non_buffered_downstream(r); |
| 581 | 3098 |
| 3099 } else { | |
| 3100 u->buffer.pos = u->buffer.start; | |
| 3101 u->buffer.last = u->buffer.start; | |
| 3102 | |
| 3103 if (ngx_http_send_special(r, NGX_HTTP_FLUSH) == NGX_ERROR) { | |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3104 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
| 581 | 3105 return; |
| 3106 } | |
|
1468
491e5059ea19
read EOF of header only responses in non-buffered proxying
Igor Sysoev <igor@sysoev.ru>
parents:
1397
diff
changeset
|
3107 |
|
7809
b1302f1dd2f6
Upstream: fixed non-buffered proxying with eventport.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7760
diff
changeset
|
3108 ngx_http_upstream_process_non_buffered_upstream(r, u); |
| 581 | 3109 } |
| 3110 | |
| 3111 return; | |
| 3112 } | |
| 3113 | |
| 479 | 3114 /* TODO: preallocate event_pipe bufs, look "Content-Length" */ |
| 3115 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3116 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3117 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3118 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
|
3119 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
|
3120 r->cache->file.fd = NGX_INVALID_FILE; |
| 479 | 3121 } |
| 3122 | |
|
3699
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
3123 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
|
3124 |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
3125 case NGX_ERROR: |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3126 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
3699
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
3127 return; |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
3128 |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
3129 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
|
3130 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
|
3131 break; |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
3132 |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
3133 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
|
3134 |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
3135 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
|
3136 |
|
5950
eaeecf00d5d7
Upstream: preset some cache configuration when bypassing.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3137 /* create cache if previously bypassed */ |
|
3699
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
3138 |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
3139 if (ngx_http_file_cache_create(r) != NGX_OK) { |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3140 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
3699
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
3141 return; |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
3142 } |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
3143 } |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
3144 |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
3145 break; |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
3146 } |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3698
diff
changeset
|
3147 |
| 1565 | 3148 if (u->cacheable) { |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3149 time_t now, valid; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3150 |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3151 now = ngx_time(); |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3152 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3153 valid = r->cache->valid_sec; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3154 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3155 if (valid == 0) { |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3156 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
|
3157 u->headers_in.status_n); |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3158 if (valid) { |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3159 r->cache->valid_sec = now + valid; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3160 } |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3161 } |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
3162 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3163 if (valid) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3164 r->cache->date = now; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3165 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
|
3166 |
|
5935
1573fc7875fa
Cache: send conditional requests only for cached 200/206 responses.
Piotr Sikora <piotr@cloudflare.com>
parents:
5928
diff
changeset
|
3167 if (u->headers_in.status_n == NGX_HTTP_OK |
|
1573fc7875fa
Cache: send conditional requests only for cached 200/206 responses.
Piotr Sikora <piotr@cloudflare.com>
parents:
5928
diff
changeset
|
3168 || u->headers_in.status_n == NGX_HTTP_PARTIAL_CONTENT) |
|
1573fc7875fa
Cache: send conditional requests only for cached 200/206 responses.
Piotr Sikora <piotr@cloudflare.com>
parents:
5928
diff
changeset
|
3169 { |
|
1573fc7875fa
Cache: send conditional requests only for cached 200/206 responses.
Piotr Sikora <piotr@cloudflare.com>
parents:
5928
diff
changeset
|
3170 r->cache->last_modified = u->headers_in.last_modified_time; |
|
1573fc7875fa
Cache: send conditional requests only for cached 200/206 responses.
Piotr Sikora <piotr@cloudflare.com>
parents:
5928
diff
changeset
|
3171 |
|
1573fc7875fa
Cache: send conditional requests only for cached 200/206 responses.
Piotr Sikora <piotr@cloudflare.com>
parents:
5928
diff
changeset
|
3172 if (u->headers_in.etag) { |
|
1573fc7875fa
Cache: send conditional requests only for cached 200/206 responses.
Piotr Sikora <piotr@cloudflare.com>
parents:
5928
diff
changeset
|
3173 r->cache->etag = u->headers_in.etag->value; |
|
5992
174512857ccf
Cache: do not inherit last_modified and etag from stale response.
Roman Arutyunyan <arut@nginx.com>
parents:
5977
diff
changeset
|
3174 |
|
174512857ccf
Cache: do not inherit last_modified and etag from stale response.
Roman Arutyunyan <arut@nginx.com>
parents:
5977
diff
changeset
|
3175 } else { |
|
174512857ccf
Cache: do not inherit last_modified and etag from stale response.
Roman Arutyunyan <arut@nginx.com>
parents:
5977
diff
changeset
|
3176 ngx_str_null(&r->cache->etag); |
|
5935
1573fc7875fa
Cache: send conditional requests only for cached 200/206 responses.
Piotr Sikora <piotr@cloudflare.com>
parents:
5928
diff
changeset
|
3177 } |
|
5992
174512857ccf
Cache: do not inherit last_modified and etag from stale response.
Roman Arutyunyan <arut@nginx.com>
parents:
5977
diff
changeset
|
3178 |
|
174512857ccf
Cache: do not inherit last_modified and etag from stale response.
Roman Arutyunyan <arut@nginx.com>
parents:
5977
diff
changeset
|
3179 } else { |
|
174512857ccf
Cache: do not inherit last_modified and etag from stale response.
Roman Arutyunyan <arut@nginx.com>
parents:
5977
diff
changeset
|
3180 r->cache->last_modified = -1; |
|
174512857ccf
Cache: do not inherit last_modified and etag from stale response.
Roman Arutyunyan <arut@nginx.com>
parents:
5977
diff
changeset
|
3181 ngx_str_null(&r->cache->etag); |
|
5737
44b9ab7752e3
Cache: ETag now saved into cache header.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5735
diff
changeset
|
3182 } |
|
44b9ab7752e3
Cache: ETag now saved into cache header.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5735
diff
changeset
|
3183 |
|
5959
f7584d7c0ccb
Cache: update variant while setting header.
Valentin Bartenev <vbart@nginx.com>
parents:
5951
diff
changeset
|
3184 if (ngx_http_file_cache_set_header(r, u->buffer.start) != NGX_OK) { |
|
f7584d7c0ccb
Cache: update variant while setting header.
Valentin Bartenev <vbart@nginx.com>
parents:
5951
diff
changeset
|
3185 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
f7584d7c0ccb
Cache: update variant while setting header.
Valentin Bartenev <vbart@nginx.com>
parents:
5951
diff
changeset
|
3186 return; |
|
f7584d7c0ccb
Cache: update variant while setting header.
Valentin Bartenev <vbart@nginx.com>
parents:
5951
diff
changeset
|
3187 } |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3188 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3189 } else { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3190 u->cacheable = 0; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3191 } |
| 479 | 3192 } |
| 3193 | |
| 2690 | 3194 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, |
| 3195 "http cacheable: %d", u->cacheable); | |
| 3196 | |
|
3083
ffe8bfb38184
clean cache updating state if a response has uncacheable code or
Igor Sysoev <igor@sysoev.ru>
parents:
3056
diff
changeset
|
3197 if (u->cacheable == 0 && r->cache) { |
|
3711
ce6ba077c270
several changes in cache cleanup handling:
Igor Sysoev <igor@sysoev.ru>
parents:
3709
diff
changeset
|
3198 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
|
3199 } |
|
ffe8bfb38184
clean cache updating state if a response has uncacheable code or
Igor Sysoev <igor@sysoev.ru>
parents:
3056
diff
changeset
|
3200 |
|
6428
545b5e4d83b2
Upstream: avoid closing client connection in edge case.
Justin Li <jli.justinli@gmail.com>
parents:
6427
diff
changeset
|
3201 if (r->header_only && !u->cacheable && !u->store) { |
|
545b5e4d83b2
Upstream: avoid closing client connection in edge case.
Justin Li <jli.justinli@gmail.com>
parents:
6427
diff
changeset
|
3202 ngx_http_upstream_finalize_request(r, u, 0); |
|
545b5e4d83b2
Upstream: avoid closing client connection in edge case.
Justin Li <jli.justinli@gmail.com>
parents:
6427
diff
changeset
|
3203 return; |
|
545b5e4d83b2
Upstream: avoid closing client connection in edge case.
Justin Li <jli.justinli@gmail.com>
parents:
6427
diff
changeset
|
3204 } |
|
545b5e4d83b2
Upstream: avoid closing client connection in edge case.
Justin Li <jli.justinli@gmail.com>
parents:
6427
diff
changeset
|
3205 |
| 479 | 3206 #endif |
| 3207 | |
| 581 | 3208 p = u->pipe; |
| 479 | 3209 |
|
6443
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3210 p->output_filter = ngx_http_upstream_output_filter; |
| 479 | 3211 p->output_ctx = r; |
| 3212 p->tag = u->output.tag; | |
| 577 | 3213 p->bufs = u->conf->bufs; |
| 479 | 3214 p->busy_size = u->conf->busy_buffers_size; |
| 3215 p->upstream = u->peer.connection; | |
| 583 | 3216 p->downstream = c; |
| 479 | 3217 p->pool = r->pool; |
| 583 | 3218 p->log = c->log; |
|
5883
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
3219 p->limit_rate = u->conf->limit_rate; |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
3220 p->start_sec = ngx_time(); |
| 577 | 3221 |
| 1565 | 3222 p->cacheable = u->cacheable || u->store; |
| 479 | 3223 |
| 501 | 3224 p->temp_file = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t)); |
| 3225 if (p->temp_file == NULL) { | |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3226 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
| 479 | 3227 return; |
| 3228 } | |
| 3229 | |
| 3230 p->temp_file->file.fd = NGX_INVALID_FILE; | |
| 583 | 3231 p->temp_file->file.log = c->log; |
| 479 | 3232 p->temp_file->path = u->conf->temp_path; |
| 3233 p->temp_file->pool = r->pool; | |
| 577 | 3234 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
3235 if (p->cacheable) { |
| 479 | 3236 p->temp_file->persistent = 1; |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
3237 |
|
5960
e9effef98874
Upstream: use_temp_path parameter of proxy_cache_path and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5959
diff
changeset
|
3238 #if (NGX_HTTP_CACHE) |
|
6795
1a917932db96
Cache: prefix-based temporary files.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6794
diff
changeset
|
3239 if (r->cache && !r->cache->file_cache->use_temp_path) { |
|
1a917932db96
Cache: prefix-based temporary files.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6794
diff
changeset
|
3240 p->temp_file->path = r->cache->file_cache->path; |
|
1a917932db96
Cache: prefix-based temporary files.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6794
diff
changeset
|
3241 p->temp_file->file.name = r->cache->file.name; |
|
5960
e9effef98874
Upstream: use_temp_path parameter of proxy_cache_path and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5959
diff
changeset
|
3242 } |
|
e9effef98874
Upstream: use_temp_path parameter of proxy_cache_path and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5959
diff
changeset
|
3243 #endif |
|
e9effef98874
Upstream: use_temp_path parameter of proxy_cache_path and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5959
diff
changeset
|
3244 |
| 479 | 3245 } else { |
| 667 | 3246 p->temp_file->log_level = NGX_LOG_WARN; |
| 479 | 3247 p->temp_file->warn = "an upstream response is buffered " |
| 3248 "to a temporary file"; | |
| 3249 } | |
| 3250 | |
| 3251 p->max_temp_file_size = u->conf->max_temp_file_size; | |
| 3252 p->temp_file_write_size = u->conf->temp_file_write_size; | |
| 3253 | |
|
6443
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3254 #if (NGX_THREADS) |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3255 if (clcf->aio == NGX_HTTP_AIO_THREADS && clcf->aio_write) { |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3256 p->thread_handler = ngx_http_upstream_thread_handler; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3257 p->thread_ctx = r; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3258 } |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3259 #endif |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3260 |
| 501 | 3261 p->preread_bufs = ngx_alloc_chain_link(r->pool); |
| 3262 if (p->preread_bufs == NULL) { | |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3263 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
| 479 | 3264 return; |
| 3265 } | |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
3266 |
| 581 | 3267 p->preread_bufs->buf = &u->buffer; |
| 479 | 3268 p->preread_bufs->next = NULL; |
| 581 | 3269 u->buffer.recycled = 1; |
| 3270 | |
| 3271 p->preread_size = u->buffer.last - u->buffer.pos; | |
| 479 | 3272 |
| 1565 | 3273 if (u->cacheable) { |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
3274 |
| 479 | 3275 p->buf_to_file = ngx_calloc_buf(r->pool); |
| 3276 if (p->buf_to_file == NULL) { | |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3277 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
| 479 | 3278 return; |
| 3279 } | |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
3280 |
|
4895
508e61393b6c
Event pipe: fixed handling of buf_to_file data.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4769
diff
changeset
|
3281 p->buf_to_file->start = u->buffer.start; |
| 581 | 3282 p->buf_to_file->pos = u->buffer.start; |
| 3283 p->buf_to_file->last = u->buffer.pos; | |
| 479 | 3284 p->buf_to_file->temporary = 1; |
| 3285 } | |
| 3286 | |
|
6125
4dc8e7b62216
Removed the obsolete aio module.
Ruslan Ermilov <ru@nginx.com>
parents:
6068
diff
changeset
|
3287 if (ngx_event_flags & NGX_USE_IOCP_EVENT) { |
|
4499
778ef9c3fd2d
Fixed spelling in single-line comments.
Ruslan Ermilov <ru@nginx.com>
parents:
4474
diff
changeset
|
3288 /* the posted aio operation may corrupt a shadow buffer */ |
| 479 | 3289 p->single_buf = 1; |
| 3290 } | |
| 3291 | |
| 3292 /* TODO: p->free_bufs = 0 if use ngx_create_chain_of_bufs() */ | |
| 3293 p->free_bufs = 1; | |
| 3294 | |
| 3295 /* | |
| 581 | 3296 * event_pipe would do u->buffer.last += p->preread_size |
| 479 | 3297 * as though these bytes were read |
| 3298 */ | |
| 581 | 3299 u->buffer.last = u->buffer.pos; |
| 479 | 3300 |
| 3301 if (u->conf->cyclic_temp_file) { | |
| 3302 | |
| 3303 /* | |
| 3304 * we need to disable the use of sendfile() if we use cyclic temp file | |
| 3305 * because the writing a new data may interfere with sendfile() | |
| 3306 * that uses the same kernel file pages (at least on FreeBSD) | |
| 3307 */ | |
| 3308 | |
| 3309 p->cyclic_temp_file = 1; | |
| 583 | 3310 c->sendfile = 0; |
| 479 | 3311 |
| 3312 } else { | |
| 3313 p->cyclic_temp_file = 0; | |
| 3314 } | |
| 3315 | |
| 3316 p->read_timeout = u->conf->read_timeout; | |
| 3317 p->send_timeout = clcf->send_timeout; | |
| 3318 p->send_lowat = clcf->send_lowat; | |
| 3319 | |
|
4119
b66712cde67d
Upstream: pipe length and input_filter_init in buffered mode.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4118
diff
changeset
|
3320 p->length = -1; |
|
b66712cde67d
Upstream: pipe length and input_filter_init in buffered mode.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4118
diff
changeset
|
3321 |
|
b66712cde67d
Upstream: pipe length and input_filter_init in buffered mode.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4118
diff
changeset
|
3322 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
|
3323 && 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
|
3324 { |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3325 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
4119
b66712cde67d
Upstream: pipe length and input_filter_init in buffered mode.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4118
diff
changeset
|
3326 return; |
|
b66712cde67d
Upstream: pipe length and input_filter_init in buffered mode.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4118
diff
changeset
|
3327 } |
|
b66712cde67d
Upstream: pipe length and input_filter_init in buffered mode.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4118
diff
changeset
|
3328 |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3329 u->read_event_handler = ngx_http_upstream_process_upstream; |
| 509 | 3330 r->write_event_handler = ngx_http_upstream_process_downstream; |
| 479 | 3331 |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
3332 ngx_http_upstream_process_upstream(r, u); |
| 479 | 3333 } |
| 3334 | |
| 3335 | |
| 487 | 3336 static void |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3337 ngx_http_upstream_upgrade(ngx_http_request_t *r, ngx_http_upstream_t *u) |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3338 { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3339 ngx_connection_t *c; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3340 ngx_http_core_loc_conf_t *clcf; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3341 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3342 c = r->connection; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3343 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3344 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3345 /* TODO: prevent upgrade if not requested or not possible */ |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3346 |
|
7131
6a5a91de5b74
Upstream: disabled upgrading in subrequests.
Roman Arutyunyan <arut@nginx.com>
parents:
7130
diff
changeset
|
3347 if (r != r->main) { |
|
6a5a91de5b74
Upstream: disabled upgrading in subrequests.
Roman Arutyunyan <arut@nginx.com>
parents:
7130
diff
changeset
|
3348 ngx_log_error(NGX_LOG_ERR, c->log, 0, |
|
6a5a91de5b74
Upstream: disabled upgrading in subrequests.
Roman Arutyunyan <arut@nginx.com>
parents:
7130
diff
changeset
|
3349 "connection upgrade in subrequest"); |
|
6a5a91de5b74
Upstream: disabled upgrading in subrequests.
Roman Arutyunyan <arut@nginx.com>
parents:
7130
diff
changeset
|
3350 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
6a5a91de5b74
Upstream: disabled upgrading in subrequests.
Roman Arutyunyan <arut@nginx.com>
parents:
7130
diff
changeset
|
3351 return; |
|
6a5a91de5b74
Upstream: disabled upgrading in subrequests.
Roman Arutyunyan <arut@nginx.com>
parents:
7130
diff
changeset
|
3352 } |
|
6a5a91de5b74
Upstream: disabled upgrading in subrequests.
Roman Arutyunyan <arut@nginx.com>
parents:
7130
diff
changeset
|
3353 |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3354 r->keepalive = 0; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3355 c->log->action = "proxying upgraded connection"; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3356 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3357 u->read_event_handler = ngx_http_upstream_upgraded_read_upstream; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3358 u->write_event_handler = ngx_http_upstream_upgraded_write_upstream; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3359 r->read_event_handler = ngx_http_upstream_upgraded_read_downstream; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3360 r->write_event_handler = ngx_http_upstream_upgraded_write_downstream; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3361 |
|
5142
afea5259e05c
Upstream: fixed tcp_nodelay with connection upgrade (ticket #325).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5132
diff
changeset
|
3362 if (clcf->tcp_nodelay) { |
|
7007
ed1101bbf19f
Introduced ngx_tcp_nodelay().
Ruslan Ermilov <ru@nginx.com>
parents:
7006
diff
changeset
|
3363 |
|
ed1101bbf19f
Introduced ngx_tcp_nodelay().
Ruslan Ermilov <ru@nginx.com>
parents:
7006
diff
changeset
|
3364 if (ngx_tcp_nodelay(c) != NGX_OK) { |
|
ed1101bbf19f
Introduced ngx_tcp_nodelay().
Ruslan Ermilov <ru@nginx.com>
parents:
7006
diff
changeset
|
3365 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
ed1101bbf19f
Introduced ngx_tcp_nodelay().
Ruslan Ermilov <ru@nginx.com>
parents:
7006
diff
changeset
|
3366 return; |
|
ed1101bbf19f
Introduced ngx_tcp_nodelay().
Ruslan Ermilov <ru@nginx.com>
parents:
7006
diff
changeset
|
3367 } |
|
ed1101bbf19f
Introduced ngx_tcp_nodelay().
Ruslan Ermilov <ru@nginx.com>
parents:
7006
diff
changeset
|
3368 |
|
ed1101bbf19f
Introduced ngx_tcp_nodelay().
Ruslan Ermilov <ru@nginx.com>
parents:
7006
diff
changeset
|
3369 if (ngx_tcp_nodelay(u->peer.connection) != NGX_OK) { |
|
ed1101bbf19f
Introduced ngx_tcp_nodelay().
Ruslan Ermilov <ru@nginx.com>
parents:
7006
diff
changeset
|
3370 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
ed1101bbf19f
Introduced ngx_tcp_nodelay().
Ruslan Ermilov <ru@nginx.com>
parents:
7006
diff
changeset
|
3371 return; |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3372 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3373 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3374 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3375 if (ngx_http_send_special(r, NGX_HTTP_FLUSH) == NGX_ERROR) { |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3376 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3377 return; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3378 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3379 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3380 if (u->peer.connection->read->ready |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3381 || u->buffer.pos != u->buffer.last) |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3382 { |
|
5579
7586e7b2dbe9
Upstream: ngx_post_event() instead of upgraded call (ticket #503).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5557
diff
changeset
|
3383 ngx_post_event(c->read, &ngx_posted_events); |
|
5073
52eb762c68a9
Proxy: fixed do_write handling in previous commit.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5072
diff
changeset
|
3384 ngx_http_upstream_process_upgraded(r, 1, 1); |
|
5579
7586e7b2dbe9
Upstream: ngx_post_event() instead of upgraded call (ticket #503).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5557
diff
changeset
|
3385 return; |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3386 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3387 |
|
5532
17134d29782e
Upstream: reading from a client after connection upgrade.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5500
diff
changeset
|
3388 ngx_http_upstream_process_upgraded(r, 0, 1); |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3389 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3390 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3391 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3392 static void |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3393 ngx_http_upstream_upgraded_read_downstream(ngx_http_request_t *r) |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3394 { |
|
5073
52eb762c68a9
Proxy: fixed do_write handling in previous commit.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5072
diff
changeset
|
3395 ngx_http_upstream_process_upgraded(r, 0, 0); |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3396 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3397 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3398 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3399 static void |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3400 ngx_http_upstream_upgraded_write_downstream(ngx_http_request_t *r) |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3401 { |
|
5073
52eb762c68a9
Proxy: fixed do_write handling in previous commit.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5072
diff
changeset
|
3402 ngx_http_upstream_process_upgraded(r, 1, 1); |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3403 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3404 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3405 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3406 static void |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3407 ngx_http_upstream_upgraded_read_upstream(ngx_http_request_t *r, |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3408 ngx_http_upstream_t *u) |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3409 { |
|
5073
52eb762c68a9
Proxy: fixed do_write handling in previous commit.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5072
diff
changeset
|
3410 ngx_http_upstream_process_upgraded(r, 1, 0); |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3411 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3412 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3413 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3414 static void |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3415 ngx_http_upstream_upgraded_write_upstream(ngx_http_request_t *r, |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3416 ngx_http_upstream_t *u) |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3417 { |
|
5073
52eb762c68a9
Proxy: fixed do_write handling in previous commit.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5072
diff
changeset
|
3418 ngx_http_upstream_process_upgraded(r, 0, 1); |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3419 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3420 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3421 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3422 static void |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3423 ngx_http_upstream_process_upgraded(ngx_http_request_t *r, |
|
5073
52eb762c68a9
Proxy: fixed do_write handling in previous commit.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5072
diff
changeset
|
3424 ngx_uint_t from_upstream, ngx_uint_t do_write) |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3425 { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3426 size_t size; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3427 ssize_t n; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3428 ngx_buf_t *b; |
|
7538
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3429 ngx_uint_t flags; |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3430 ngx_connection_t *c, *downstream, *upstream, *dst, *src; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3431 ngx_http_upstream_t *u; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3432 ngx_http_core_loc_conf_t *clcf; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3433 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3434 c = r->connection; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3435 u = r->upstream; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3436 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3437 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3438 "http upstream process upgraded, fu:%ui", from_upstream); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3439 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3440 downstream = c; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3441 upstream = u->peer.connection; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3442 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3443 if (downstream->write->timedout) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3444 c->timedout = 1; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3445 ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out"); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3446 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_REQUEST_TIME_OUT); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3447 return; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3448 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3449 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3450 if (upstream->read->timedout || upstream->write->timedout) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3451 ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out"); |
|
5296
1ccdda1f37f3
Upstream: NGX_HTTP_GATEWAY_TIME_OUT after upstream timeouts.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5295
diff
changeset
|
3452 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_GATEWAY_TIME_OUT); |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3453 return; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3454 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3455 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3456 if (from_upstream) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3457 src = upstream; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3458 dst = downstream; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3459 b = &u->buffer; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3460 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3461 } else { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3462 src = downstream; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3463 dst = upstream; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3464 b = &u->from_client; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3465 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3466 if (r->header_in->last > r->header_in->pos) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3467 b = r->header_in; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3468 b->end = b->last; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3469 do_write = 1; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3470 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3471 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3472 if (b->start == NULL) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3473 b->start = ngx_palloc(r->pool, u->conf->buffer_size); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3474 if (b->start == NULL) { |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3475 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3476 return; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3477 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3478 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3479 b->pos = b->start; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3480 b->last = b->start; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3481 b->end = b->start + u->conf->buffer_size; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3482 b->temporary = 1; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3483 b->tag = u->output.tag; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3484 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3485 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3486 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3487 for ( ;; ) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3488 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3489 if (do_write) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3490 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3491 size = b->last - b->pos; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3492 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3493 if (size && dst->write->ready) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3494 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3495 n = dst->send(dst, b->pos, size); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3496 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3497 if (n == NGX_ERROR) { |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3498 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3499 return; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3500 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3501 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3502 if (n > 0) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3503 b->pos += n; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3504 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3505 if (b->pos == b->last) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3506 b->pos = b->start; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3507 b->last = b->start; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3508 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3509 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3510 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3511 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3512 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3513 size = b->end - b->last; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3514 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3515 if (size && src->read->ready) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3516 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3517 n = src->recv(src, b->last, size); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3518 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3519 if (n == NGX_AGAIN || n == 0) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3520 break; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3521 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3522 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3523 if (n > 0) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3524 do_write = 1; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3525 b->last += n; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3526 |
|
6654
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
3527 if (from_upstream) { |
|
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
3528 u->state->bytes_received += n; |
|
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
3529 } |
|
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
3530 |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3531 continue; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3532 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3533 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3534 if (n == NGX_ERROR) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3535 src->read->eof = 1; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3536 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3537 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3538 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3539 break; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3540 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3541 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3542 if ((upstream->read->eof && u->buffer.pos == u->buffer.last) |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3543 || (downstream->read->eof && u->from_client.pos == u->from_client.last) |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3544 || (downstream->read->eof && upstream->read->eof)) |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3545 { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3546 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3547 "http upstream upgraded done"); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3548 ngx_http_upstream_finalize_request(r, u, 0); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3549 return; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3550 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3551 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3552 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3553 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3554 if (ngx_handle_write_event(upstream->write, u->conf->send_lowat) |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3555 != NGX_OK) |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3556 { |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3557 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3558 return; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3559 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3560 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3561 if (upstream->write->active && !upstream->write->ready) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3562 ngx_add_timer(upstream->write, u->conf->send_timeout); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3563 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3564 } else if (upstream->write->timer_set) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3565 ngx_del_timer(upstream->write); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3566 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3567 |
|
7538
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3568 if (upstream->read->eof || upstream->read->error) { |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3569 flags = NGX_CLOSE_EVENT; |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3570 |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3571 } else { |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3572 flags = 0; |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3573 } |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3574 |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3575 if (ngx_handle_read_event(upstream->read, flags) != NGX_OK) { |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3576 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3577 return; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3578 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3579 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3580 if (upstream->read->active && !upstream->read->ready) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3581 ngx_add_timer(upstream->read, u->conf->read_timeout); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3582 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3583 } else if (upstream->read->timer_set) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3584 ngx_del_timer(upstream->read); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3585 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3586 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3587 if (ngx_handle_write_event(downstream->write, clcf->send_lowat) |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3588 != NGX_OK) |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3589 { |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3590 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3591 return; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3592 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3593 |
|
7538
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3594 if (downstream->read->eof || downstream->read->error) { |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3595 flags = NGX_CLOSE_EVENT; |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3596 |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3597 } else { |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3598 flags = 0; |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3599 } |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3600 |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3601 if (ngx_handle_read_event(downstream->read, flags) != NGX_OK) { |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3602 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
5072
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3603 return; |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3604 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3605 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3606 if (downstream->write->active && !downstream->write->ready) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3607 ngx_add_timer(downstream->write, clcf->send_timeout); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3608 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3609 } else if (downstream->write->timer_set) { |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3610 ngx_del_timer(downstream->write); |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3611 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3612 } |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3613 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3614 |
|
7fa7e60a7f66
Proxy: support for connection upgrade (101 Switching Protocols).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
3615 static void |
| 581 | 3616 ngx_http_upstream_process_non_buffered_downstream(ngx_http_request_t *r) |
| 3617 { | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3618 ngx_event_t *wev; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3619 ngx_connection_t *c; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3620 ngx_http_upstream_t *u; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3621 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3622 c = r->connection; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3623 u = r->upstream; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3624 wev = c->write; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3625 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3626 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
|
3627 "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
|
3628 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3629 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
|
3630 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3631 if (wev->timedout) { |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3632 c->timedout = 1; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3633 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
|
3634 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
|
3635 return; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3636 } |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3637 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3638 ngx_http_upstream_process_non_buffered_request(r, 1); |
| 581 | 3639 } |
| 3640 | |
| 3641 | |
| 3642 static void | |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
3643 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
|
3644 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
|
3645 { |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
3646 ngx_connection_t *c; |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
3647 |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
3648 c = u->peer.connection; |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3649 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3650 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
|
3651 "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
|
3652 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3653 c->log->action = "reading upstream"; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3654 |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
3655 if (c->read->timedout) { |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3656 ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out"); |
|
5296
1ccdda1f37f3
Upstream: NGX_HTTP_GATEWAY_TIME_OUT after upstream timeouts.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5295
diff
changeset
|
3657 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_GATEWAY_TIME_OUT); |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3658 return; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3659 } |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3660 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3661 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
|
3662 } |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3663 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3664 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3665 static void |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3666 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
|
3667 ngx_uint_t do_write) |
| 581 | 3668 { |
| 3669 size_t size; | |
| 3670 ssize_t n; | |
| 3671 ngx_buf_t *b; | |
| 583 | 3672 ngx_int_t rc; |
|
7538
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3673 ngx_uint_t flags; |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3674 ngx_connection_t *downstream, *upstream; |
| 581 | 3675 ngx_http_upstream_t *u; |
| 3676 ngx_http_core_loc_conf_t *clcf; | |
| 3677 | |
|
756
d904b5cb3bba
fix building introduced by previous commit
Igor Sysoev <igor@sysoev.ru>
parents:
755
diff
changeset
|
3678 u = r->upstream; |
| 884 | 3679 downstream = r->connection; |
| 3680 upstream = u->peer.connection; | |
| 581 | 3681 |
| 3682 b = &u->buffer; | |
| 3683 | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3684 do_write = do_write || u->length == 0; |
| 581 | 3685 |
| 3686 for ( ;; ) { | |
| 3687 | |
| 3688 if (do_write) { | |
| 3689 | |
|
7166
a762ddf22dbb
Upstream: flush low-level buffers on write retry.
Patryk Lesiewicz <patryk@google.com>
parents:
7131
diff
changeset
|
3690 if (u->out_bufs || u->busy_bufs || downstream->buffered) { |
| 583 | 3691 rc = ngx_http_output_filter(r, u->out_bufs); |
| 3692 | |
| 3693 if (rc == NGX_ERROR) { | |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3694 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
| 581 | 3695 return; |
| 3696 } | |
| 3697 | |
|
4114
5db098f97e0e
API change: ngx_chain_update_chains() now requires pool.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
3698 ngx_chain_update_chains(r->pool, &u->free_bufs, &u->busy_bufs, |
| 581 | 3699 &u->out_bufs, u->output.tag); |
| 3700 } | |
| 3701 | |
| 3702 if (u->busy_bufs == NULL) { | |
| 3703 | |
| 3704 if (u->length == 0 | |
|
5301
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
3705 || (upstream->read->eof && u->length == -1)) |
| 581 | 3706 { |
| 3707 ngx_http_upstream_finalize_request(r, u, 0); | |
| 3708 return; | |
| 3709 } | |
| 3710 | |
|
5301
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
3711 if (upstream->read->eof) { |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
3712 ngx_log_error(NGX_LOG_ERR, upstream->log, 0, |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
3713 "upstream prematurely closed connection"); |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
3714 |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
3715 ngx_http_upstream_finalize_request(r, u, |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
3716 NGX_HTTP_BAD_GATEWAY); |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
3717 return; |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
3718 } |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
3719 |
|
7679
05e42236e95b
FastCGI: protection from responses with wrong length.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7678
diff
changeset
|
3720 if (upstream->read->error || u->error) { |
|
5301
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
3721 ngx_http_upstream_finalize_request(r, u, |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
3722 NGX_HTTP_BAD_GATEWAY); |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
3723 return; |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
3724 } |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
3725 |
| 581 | 3726 b->pos = b->start; |
| 3727 b->last = b->start; | |
| 3728 } | |
| 3729 } | |
| 3730 | |
| 3731 size = b->end - b->last; | |
| 3732 | |
| 884 | 3733 if (size && upstream->read->ready) { |
| 3734 | |
| 3735 n = upstream->recv(upstream, b->last, size); | |
| 581 | 3736 |
| 3737 if (n == NGX_AGAIN) { | |
| 3738 break; | |
| 3739 } | |
| 3740 | |
| 3741 if (n > 0) { | |
|
6654
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
3742 u->state->bytes_received += n; |
| 2402 | 3743 u->state->response_length += n; |
| 3744 | |
| 581 | 3745 if (u->input_filter(u->input_filter_ctx, n) == NGX_ERROR) { |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3746 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
| 581 | 3747 return; |
| 3748 } | |
| 3749 } | |
| 3750 | |
| 3751 do_write = 1; | |
| 3752 | |
| 3753 continue; | |
| 3754 } | |
| 3755 | |
| 3756 break; | |
| 3757 } | |
| 3758 | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
3759 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
|
3760 |
| 884 | 3761 if (downstream->data == r) { |
| 3762 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
|
3763 != NGX_OK) |
| 583 | 3764 { |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3765 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
| 583 | 3766 return; |
| 3767 } | |
| 581 | 3768 } |
| 3769 | |
|
1063
e2a6ecc5a3ae
a non-active client connection must not closed after send timeout
Igor Sysoev <igor@sysoev.ru>
parents:
1031
diff
changeset
|
3770 if (downstream->write->active && !downstream->write->ready) { |
| 884 | 3771 ngx_add_timer(downstream->write, clcf->send_timeout); |
| 3772 | |
| 3773 } else if (downstream->write->timer_set) { | |
| 3774 ngx_del_timer(downstream->write); | |
| 581 | 3775 } |
| 3776 | |
|
7538
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3777 if (upstream->read->eof || upstream->read->error) { |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3778 flags = NGX_CLOSE_EVENT; |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3779 |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3780 } else { |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3781 flags = 0; |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3782 } |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3783 |
|
08ed570ad93c
Upstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7514
diff
changeset
|
3784 if (ngx_handle_read_event(upstream->read, flags) != NGX_OK) { |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
3785 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
| 581 | 3786 return; |
| 3787 } | |
| 3788 | |
|
1063
e2a6ecc5a3ae
a non-active client connection must not closed after send timeout
Igor Sysoev <igor@sysoev.ru>
parents:
1031
diff
changeset
|
3789 if (upstream->read->active && !upstream->read->ready) { |
| 884 | 3790 ngx_add_timer(upstream->read, u->conf->read_timeout); |
| 3791 | |
| 3792 } else if (upstream->read->timer_set) { | |
| 3793 ngx_del_timer(upstream->read); | |
| 581 | 3794 } |
| 3795 } | |
| 3796 | |
| 3797 | |
|
7678
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7649
diff
changeset
|
3798 ngx_int_t |
| 581 | 3799 ngx_http_upstream_non_buffered_filter_init(void *data) |
| 3800 { | |
| 3801 return NGX_OK; | |
| 3802 } | |
| 3803 | |
| 3804 | |
|
7678
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7649
diff
changeset
|
3805 ngx_int_t |
| 581 | 3806 ngx_http_upstream_non_buffered_filter(void *data, ssize_t bytes) |
| 3807 { | |
| 3808 ngx_http_request_t *r = data; | |
| 3809 | |
| 3810 ngx_buf_t *b; | |
| 3811 ngx_chain_t *cl, **ll; | |
| 3812 ngx_http_upstream_t *u; | |
| 3813 | |
| 3814 u = r->upstream; | |
| 3815 | |
|
7760
83c4622053b0
Upstream: fixed zero size buf alerts on extra data (ticket #2117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7702
diff
changeset
|
3816 if (u->length == 0) { |
|
83c4622053b0
Upstream: fixed zero size buf alerts on extra data (ticket #2117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7702
diff
changeset
|
3817 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0, |
|
83c4622053b0
Upstream: fixed zero size buf alerts on extra data (ticket #2117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7702
diff
changeset
|
3818 "upstream sent more data than specified in " |
|
83c4622053b0
Upstream: fixed zero size buf alerts on extra data (ticket #2117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7702
diff
changeset
|
3819 "\"Content-Length\" header"); |
|
83c4622053b0
Upstream: fixed zero size buf alerts on extra data (ticket #2117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7702
diff
changeset
|
3820 return NGX_OK; |
|
83c4622053b0
Upstream: fixed zero size buf alerts on extra data (ticket #2117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7702
diff
changeset
|
3821 } |
|
83c4622053b0
Upstream: fixed zero size buf alerts on extra data (ticket #2117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7702
diff
changeset
|
3822 |
| 581 | 3823 for (cl = u->out_bufs, ll = &u->out_bufs; cl; cl = cl->next) { |
| 3824 ll = &cl->next; | |
| 3825 } | |
| 3826 | |
| 3827 cl = ngx_chain_get_free_buf(r->pool, &u->free_bufs); | |
| 3828 if (cl == NULL) { | |
| 3829 return NGX_ERROR; | |
| 3830 } | |
| 3831 | |
| 3832 *ll = cl; | |
| 3833 | |
| 3834 cl->buf->flush = 1; | |
| 3835 cl->buf->memory = 1; | |
| 3836 | |
| 3837 b = &u->buffer; | |
| 3838 | |
| 3839 cl->buf->pos = b->last; | |
| 3840 b->last += bytes; | |
| 3841 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
|
3842 cl->buf->tag = u->output.tag; |
| 581 | 3843 |
|
4118
dbddec65fdab
Upstream: r->upstream->length type change to off_t.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4117
diff
changeset
|
3844 if (u->length == -1) { |
| 581 | 3845 return NGX_OK; |
| 3846 } | |
| 3847 | |
|
7678
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7649
diff
changeset
|
3848 if (bytes > u->length) { |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7649
diff
changeset
|
3849 |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7649
diff
changeset
|
3850 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0, |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7649
diff
changeset
|
3851 "upstream sent more data than specified in " |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7649
diff
changeset
|
3852 "\"Content-Length\" header"); |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7649
diff
changeset
|
3853 |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7649
diff
changeset
|
3854 cl->buf->last = cl->buf->pos + u->length; |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7649
diff
changeset
|
3855 u->length = 0; |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7649
diff
changeset
|
3856 |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7649
diff
changeset
|
3857 return NGX_OK; |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7649
diff
changeset
|
3858 } |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7649
diff
changeset
|
3859 |
| 581 | 3860 u->length -= bytes; |
| 3861 | |
| 3862 return NGX_OK; | |
| 3863 } | |
| 3864 | |
| 3865 | |
|
6443
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3866 #if (NGX_THREADS) |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3867 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3868 static ngx_int_t |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3869 ngx_http_upstream_thread_handler(ngx_thread_task_t *task, ngx_file_t *file) |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3870 { |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3871 ngx_str_t name; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3872 ngx_event_pipe_t *p; |
|
7974
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3873 ngx_connection_t *c; |
|
6443
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3874 ngx_thread_pool_t *tp; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3875 ngx_http_request_t *r; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3876 ngx_http_core_loc_conf_t *clcf; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3877 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3878 r = file->thread_ctx; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3879 p = r->upstream->pipe; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3880 |
|
7974
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3881 if (r->aio) { |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3882 /* |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3883 * tolerate sendfile() calls if another operation is already |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3884 * running; this can happen due to subrequests, multiple calls |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3885 * of the next body filter from a filter, or in HTTP/2 due to |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3886 * a write event on the main connection |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3887 */ |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3888 |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3889 c = r->connection; |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3890 |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3891 #if (NGX_HTTP_V2) |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3892 if (r->stream) { |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3893 c = r->stream->connection->connection; |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3894 } |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3895 #endif |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3896 |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3897 if (task == c->sendfile_task) { |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3898 return NGX_OK; |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3899 } |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3900 } |
|
555533169506
HTTP/2: fixed "task already active" with sendfile in threads.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7949
diff
changeset
|
3901 |
|
6443
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3902 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3903 tp = clcf->thread_pool; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3904 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3905 if (tp == NULL) { |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3906 if (ngx_http_complex_value(r, clcf->thread_pool_value, &name) |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3907 != NGX_OK) |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3908 { |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3909 return NGX_ERROR; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3910 } |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3911 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3912 tp = ngx_thread_pool_get((ngx_cycle_t *) ngx_cycle, &name); |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3913 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3914 if (tp == NULL) { |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3915 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3916 "thread pool \"%V\" not found", &name); |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3917 return NGX_ERROR; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3918 } |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3919 } |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3920 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3921 task->event.data = r; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3922 task->event.handler = ngx_http_upstream_thread_event_handler; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3923 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3924 if (ngx_thread_task_post(tp, task) != NGX_OK) { |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3925 return NGX_ERROR; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3926 } |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3927 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3928 r->main->blocked++; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3929 r->aio = 1; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3930 p->aio = 1; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3931 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3932 return NGX_OK; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3933 } |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3934 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3935 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3936 static void |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3937 ngx_http_upstream_thread_event_handler(ngx_event_t *ev) |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3938 { |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3939 ngx_connection_t *c; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3940 ngx_http_request_t *r; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3941 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3942 r = ev->data; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3943 c = r->connection; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3944 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3945 ngx_http_set_log_request(c->log, r); |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3946 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3947 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3948 "http upstream thread: \"%V?%V\"", &r->uri, &r->args); |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3949 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3950 r->main->blocked--; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3951 r->aio = 0; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3952 |
|
7975
a7a77549265e
HTTP/2: fixed sendfile() aio handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7974
diff
changeset
|
3953 #if (NGX_HTTP_V2) |
|
a7a77549265e
HTTP/2: fixed sendfile() aio handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7974
diff
changeset
|
3954 |
|
a7a77549265e
HTTP/2: fixed sendfile() aio handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7974
diff
changeset
|
3955 if (r->stream) { |
|
a7a77549265e
HTTP/2: fixed sendfile() aio handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7974
diff
changeset
|
3956 /* |
|
a7a77549265e
HTTP/2: fixed sendfile() aio handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7974
diff
changeset
|
3957 * for HTTP/2, update write event to make sure processing will |
|
a7a77549265e
HTTP/2: fixed sendfile() aio handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7974
diff
changeset
|
3958 * reach the main connection to handle sendfile() in threads |
|
a7a77549265e
HTTP/2: fixed sendfile() aio handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7974
diff
changeset
|
3959 */ |
|
a7a77549265e
HTTP/2: fixed sendfile() aio handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7974
diff
changeset
|
3960 |
|
a7a77549265e
HTTP/2: fixed sendfile() aio handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7974
diff
changeset
|
3961 c->write->ready = 1; |
|
a7a77549265e
HTTP/2: fixed sendfile() aio handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7974
diff
changeset
|
3962 c->write->active = 0; |
|
a7a77549265e
HTTP/2: fixed sendfile() aio handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7974
diff
changeset
|
3963 } |
|
a7a77549265e
HTTP/2: fixed sendfile() aio handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7974
diff
changeset
|
3964 |
|
a7a77549265e
HTTP/2: fixed sendfile() aio handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7974
diff
changeset
|
3965 #endif |
|
a7a77549265e
HTTP/2: fixed sendfile() aio handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7974
diff
changeset
|
3966 |
|
6950
4cb4ffe06785
Threads: fixed request hang with aio_write and subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6923
diff
changeset
|
3967 if (r->done) { |
|
4cb4ffe06785
Threads: fixed request hang with aio_write and subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6923
diff
changeset
|
3968 /* |
|
4cb4ffe06785
Threads: fixed request hang with aio_write and subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6923
diff
changeset
|
3969 * trigger connection event handler if the subrequest was |
|
4cb4ffe06785
Threads: fixed request hang with aio_write and subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6923
diff
changeset
|
3970 * already finalized; this can happen if the handler is used |
|
4cb4ffe06785
Threads: fixed request hang with aio_write and subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6923
diff
changeset
|
3971 * for sendfile() in threads |
|
4cb4ffe06785
Threads: fixed request hang with aio_write and subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6923
diff
changeset
|
3972 */ |
|
4cb4ffe06785
Threads: fixed request hang with aio_write and subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6923
diff
changeset
|
3973 |
|
4cb4ffe06785
Threads: fixed request hang with aio_write and subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6923
diff
changeset
|
3974 c->write->handler(c->write); |
|
4cb4ffe06785
Threads: fixed request hang with aio_write and subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6923
diff
changeset
|
3975 |
|
4cb4ffe06785
Threads: fixed request hang with aio_write and subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6923
diff
changeset
|
3976 } else { |
|
4cb4ffe06785
Threads: fixed request hang with aio_write and subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6923
diff
changeset
|
3977 r->write_event_handler(r); |
|
4cb4ffe06785
Threads: fixed request hang with aio_write and subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6923
diff
changeset
|
3978 ngx_http_run_posted_requests(c); |
|
4cb4ffe06785
Threads: fixed request hang with aio_write and subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6923
diff
changeset
|
3979 } |
|
6443
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3980 } |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3981 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3982 #endif |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3983 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3984 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3985 static ngx_int_t |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3986 ngx_http_upstream_output_filter(void *data, ngx_chain_t *chain) |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3987 { |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3988 ngx_int_t rc; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3989 ngx_event_pipe_t *p; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3990 ngx_http_request_t *r; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3991 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3992 r = data; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3993 p = r->upstream->pipe; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3994 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3995 rc = ngx_http_output_filter(r, chain); |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3996 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3997 p->aio = r->aio; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3998 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
3999 return rc; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
4000 } |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
4001 |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
4002 |
| 581 | 4003 static void |
| 509 | 4004 ngx_http_upstream_process_downstream(ngx_http_request_t *r) |
| 4005 { | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4006 ngx_event_t *wev; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4007 ngx_connection_t *c; |
| 509 | 4008 ngx_event_pipe_t *p; |
| 479 | 4009 ngx_http_upstream_t *u; |
| 4010 | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4011 c = r->connection; |
| 479 | 4012 u = r->upstream; |
| 581 | 4013 p = u->pipe; |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4014 wev = c->write; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4015 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4016 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
|
4017 "http upstream process downstream"); |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4018 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4019 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
|
4020 |
|
6443
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
4021 #if (NGX_THREADS) |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
4022 p->aio = r->aio; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
4023 #endif |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
4024 |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4025 if (wev->timedout) { |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4026 |
|
6961
903fb1ddc07f
Moved handling of wev->delayed to the connection event handler.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6950
diff
changeset
|
4027 p->downstream_error = 1; |
|
903fb1ddc07f
Moved handling of wev->delayed to the connection event handler.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6950
diff
changeset
|
4028 c->timedout = 1; |
|
903fb1ddc07f
Moved handling of wev->delayed to the connection event handler.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6950
diff
changeset
|
4029 ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out"); |
| 479 | 4030 |
| 4031 } else { | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4032 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4033 if (wev->delayed) { |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4034 |
| 527 | 4035 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, |
| 4036 "http downstream delayed"); | |
| 4037 | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4038 if (ngx_handle_write_event(wev, p->send_lowat) != NGX_OK) { |
|
5295
a489c31c9783
Upstream: ngx_http_upstream_finalize_request(NGX_ERROR) on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5294
diff
changeset
|
4039 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
| 527 | 4040 } |
| 4041 | |
| 4042 return; | |
| 4043 } | |
| 4044 | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4045 if (ngx_event_pipe(p, 1) == NGX_ABORT) { |
|
5297
0ae9a2958886
Upstream: NGX_ERROR after pipe errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5296
diff
changeset
|
4046 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
| 479 | 4047 return; |
| 4048 } | |
| 4049 } | |
| 577 | 4050 |
|
5995
5f179f344096
Upstream: upstream argument in ngx_http_upstream_process_request().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5994
diff
changeset
|
4051 ngx_http_upstream_process_request(r, u); |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4052 } |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4053 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4054 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4055 static void |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
4056 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
|
4057 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
|
4058 { |
|
5883
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4059 ngx_event_t *rev; |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4060 ngx_event_pipe_t *p; |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
4061 ngx_connection_t *c; |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
4062 |
|
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
4063 c = u->peer.connection; |
|
5883
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4064 p = u->pipe; |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4065 rev = c->read; |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4066 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4067 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
|
4068 "http upstream process upstream"); |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4069 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4070 c->log->action = "reading upstream"; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4071 |
|
5883
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4072 if (rev->timedout) { |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4073 |
|
6961
903fb1ddc07f
Moved handling of wev->delayed to the connection event handler.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6950
diff
changeset
|
4074 p->upstream_error = 1; |
|
903fb1ddc07f
Moved handling of wev->delayed to the connection event handler.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6950
diff
changeset
|
4075 ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out"); |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4076 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4077 } else { |
|
5883
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4078 |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4079 if (rev->delayed) { |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4080 |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4081 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4082 "http upstream delayed"); |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4083 |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4084 if (ngx_handle_read_event(rev, 0) != NGX_OK) { |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4085 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4086 } |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4087 |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4088 return; |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4089 } |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4090 |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5878
diff
changeset
|
4091 if (ngx_event_pipe(p, 0) == NGX_ABORT) { |
|
5297
0ae9a2958886
Upstream: NGX_ERROR after pipe errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5296
diff
changeset
|
4092 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4093 return; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4094 } |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4095 } |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4096 |
|
5995
5f179f344096
Upstream: upstream argument in ngx_http_upstream_process_request().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5994
diff
changeset
|
4097 ngx_http_upstream_process_request(r, u); |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4098 } |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4099 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4100 |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4101 static void |
|
5995
5f179f344096
Upstream: upstream argument in ngx_http_upstream_process_request().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5994
diff
changeset
|
4102 ngx_http_upstream_process_request(ngx_http_request_t *r, |
|
5f179f344096
Upstream: upstream argument in ngx_http_upstream_process_request().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5994
diff
changeset
|
4103 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
|
4104 { |
| 5996 | 4105 ngx_temp_file_t *tf; |
| 4106 ngx_event_pipe_t *p; | |
|
5995
5f179f344096
Upstream: upstream argument in ngx_http_upstream_process_request().
Maxim Dounin <mdounin@mdounin.ru>
parents:
5994
diff
changeset
|
4107 |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4108 p = u->pipe; |
|
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4109 |
|
6443
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
4110 #if (NGX_THREADS) |
|
6876
a5d1b1383dea
Upstream: fixed cache corruption and socket leaks with aio_write.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6853
diff
changeset
|
4111 |
|
a5d1b1383dea
Upstream: fixed cache corruption and socket leaks with aio_write.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6853
diff
changeset
|
4112 if (p->writing && !p->aio) { |
|
a5d1b1383dea
Upstream: fixed cache corruption and socket leaks with aio_write.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6853
diff
changeset
|
4113 |
|
a5d1b1383dea
Upstream: fixed cache corruption and socket leaks with aio_write.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6853
diff
changeset
|
4114 /* |
|
a5d1b1383dea
Upstream: fixed cache corruption and socket leaks with aio_write.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6853
diff
changeset
|
4115 * make sure to call ngx_event_pipe() |
|
a5d1b1383dea
Upstream: fixed cache corruption and socket leaks with aio_write.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6853
diff
changeset
|
4116 * if there is an incomplete aio write |
|
a5d1b1383dea
Upstream: fixed cache corruption and socket leaks with aio_write.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6853
diff
changeset
|
4117 */ |
|
a5d1b1383dea
Upstream: fixed cache corruption and socket leaks with aio_write.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6853
diff
changeset
|
4118 |
|
a5d1b1383dea
Upstream: fixed cache corruption and socket leaks with aio_write.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6853
diff
changeset
|
4119 if (ngx_event_pipe(p, 1) == NGX_ABORT) { |
|
a5d1b1383dea
Upstream: fixed cache corruption and socket leaks with aio_write.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6853
diff
changeset
|
4120 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
|
a5d1b1383dea
Upstream: fixed cache corruption and socket leaks with aio_write.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6853
diff
changeset
|
4121 return; |
|
a5d1b1383dea
Upstream: fixed cache corruption and socket leaks with aio_write.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6853
diff
changeset
|
4122 } |
|
a5d1b1383dea
Upstream: fixed cache corruption and socket leaks with aio_write.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6853
diff
changeset
|
4123 } |
|
a5d1b1383dea
Upstream: fixed cache corruption and socket leaks with aio_write.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6853
diff
changeset
|
4124 |
|
6443
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
4125 if (p->writing) { |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
4126 return; |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
4127 } |
|
6876
a5d1b1383dea
Upstream: fixed cache corruption and socket leaks with aio_write.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6853
diff
changeset
|
4128 |
|
6443
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
4129 #endif |
|
fc72784b1f52
Threads: writing via threads pools in event pipe.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6439
diff
changeset
|
4130 |
| 479 | 4131 if (u->peer.connection) { |
| 4132 | |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4133 if (u->store) { |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4134 |
| 2463 | 4135 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
|
4136 |
|
5298
a7b2db9119e0
Upstream: replaced u->pipe->temp_file with p->temp_file.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5297
diff
changeset
|
4137 tf = p->temp_file; |
|
4469
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
4138 |
|
2445
3c6af1fb7586
proxy/fastcgi_store did not delete incomplete files
Igor Sysoev <igor@sysoev.ru>
parents:
2441
diff
changeset
|
4139 if (u->headers_in.status_n == NGX_HTTP_OK |
|
5299
b779728b180c
Upstream: fixed store/cache of unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5298
diff
changeset
|
4140 && (p->upstream_done || p->length == -1) |
|
2445
3c6af1fb7586
proxy/fastcgi_store did not delete incomplete files
Igor Sysoev <igor@sysoev.ru>
parents:
2441
diff
changeset
|
4141 && (u->headers_in.content_length_n == -1 |
|
5298
a7b2db9119e0
Upstream: replaced u->pipe->temp_file with p->temp_file.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5297
diff
changeset
|
4142 || u->headers_in.content_length_n == tf->offset)) |
|
2445
3c6af1fb7586
proxy/fastcgi_store did not delete incomplete files
Igor Sysoev <igor@sysoev.ru>
parents:
2441
diff
changeset
|
4143 { |
|
3c6af1fb7586
proxy/fastcgi_store did not delete incomplete files
Igor Sysoev <igor@sysoev.ru>
parents:
2441
diff
changeset
|
4144 ngx_http_upstream_store(r, u); |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4145 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4146 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4147 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4148 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
4149 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
4150 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
4151 if (u->cacheable) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
4152 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
4153 if (p->upstream_done) { |
|
5298
a7b2db9119e0
Upstream: replaced u->pipe->temp_file with p->temp_file.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5297
diff
changeset
|
4154 ngx_http_file_cache_update(r, p->temp_file); |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
4155 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
4156 } else if (p->upstream_eof) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
4157 |
|
5298
a7b2db9119e0
Upstream: replaced u->pipe->temp_file with p->temp_file.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5297
diff
changeset
|
4158 tf = p->temp_file; |
|
4298
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
4159 |
|
5299
b779728b180c
Upstream: fixed store/cache of unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5298
diff
changeset
|
4160 if (p->length == -1 |
|
b779728b180c
Upstream: fixed store/cache of unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5298
diff
changeset
|
4161 && (u->headers_in.content_length_n == -1 |
|
b779728b180c
Upstream: fixed store/cache of unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5298
diff
changeset
|
4162 || u->headers_in.content_length_n |
|
b779728b180c
Upstream: fixed store/cache of unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5298
diff
changeset
|
4163 == tf->offset - (off_t) r->cache->body_start)) |
|
4298
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
4164 { |
|
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
4165 ngx_http_file_cache_update(r, tf); |
|
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
4166 |
|
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
4167 } else { |
|
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
4168 ngx_http_file_cache_free(r->cache, tf); |
|
186f02886bed
Upstream: don't cache unfinished responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4197
diff
changeset
|
4169 } |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
4170 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
4171 } else if (p->upstream_error) { |
|
5298
a7b2db9119e0
Upstream: replaced u->pipe->temp_file with p->temp_file.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5297
diff
changeset
|
4172 ngx_http_file_cache_free(r->cache, p->temp_file); |
| 479 | 4173 } |
| 4174 } | |
| 4175 | |
| 4176 #endif | |
| 4177 | |
| 4178 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
|
4179 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 483 | 4180 "http upstream exit: %p", p->out); |
|
5301
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
4181 |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
4182 if (p->upstream_done |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
4183 || (p->upstream_eof && p->length == -1)) |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
4184 { |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
4185 ngx_http_upstream_finalize_request(r, u, 0); |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
4186 return; |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
4187 } |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
4188 |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
4189 if (p->upstream_eof) { |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
4190 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
4191 "upstream prematurely closed connection"); |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
4192 } |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
4193 |
|
a50e26148d21
Upstream: added check if a response is complete.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5300
diff
changeset
|
4194 ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY); |
| 479 | 4195 return; |
| 4196 } | |
| 4197 } | |
| 4198 | |
| 4199 if (p->downstream_error) { | |
|
2381
3d7a70173d77
fix r2378, run posted requests after upstream event handling
Igor Sysoev <igor@sysoev.ru>
parents:
2377
diff
changeset
|
4200 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 483 | 4201 "http upstream downstream error"); |
| 479 | 4202 |
|
2757
9cc973b46af1
get a full response if the response is cacheable or storable even
Igor Sysoev <igor@sysoev.ru>
parents:
2708
diff
changeset
|
4203 if (!u->cacheable && !u->store && u->peer.connection) { |
|
5297
0ae9a2958886
Upstream: NGX_ERROR after pipe errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5296
diff
changeset
|
4204 ngx_http_upstream_finalize_request(r, u, NGX_ERROR); |
| 479 | 4205 } |
| 4206 } | |
| 4207 } | |
| 4208 | |
| 4209 | |
| 487 | 4210 static void |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4211 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
|
4212 { |
|
1947
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
4213 size_t root; |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
4214 time_t lm; |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
4215 ngx_str_t path; |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
4216 ngx_temp_file_t *tf; |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
4217 ngx_ext_rename_file_t ext; |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4218 |
| 1777 | 4219 tf = u->pipe->temp_file; |
| 4220 | |
| 4221 if (tf->file.fd == NGX_INVALID_FILE) { | |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4222 |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4223 /* create file for empty 200 response */ |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4224 |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4225 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
|
4226 if (tf == NULL) { |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4227 return; |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4228 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4229 |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4230 tf->file.fd = NGX_INVALID_FILE; |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4231 tf->file.log = r->connection->log; |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4232 tf->path = u->conf->temp_path; |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4233 tf->pool = r->pool; |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4234 tf->persistent = 1; |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4235 |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4236 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
|
4237 tf->persistent, tf->clean, tf->access) |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4238 != NGX_OK) |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4239 { |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4240 return; |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4241 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4242 |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4243 u->pipe->temp_file = tf; |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4244 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4245 |
|
1947
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
4246 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
|
4247 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
|
4248 ext.time = -1; |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
4249 ext.create_path = 1; |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
4250 ext.delete_file = 1; |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
4251 ext.log = r->connection->log; |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4252 |
| 1705 | 4253 if (u->headers_in.last_modified) { |
| 4254 | |
|
6180
8b6fa4842133
Moved ngx_http_parse_time() to core, renamed accordingly.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6147
diff
changeset
|
4255 lm = ngx_parse_http_time(u->headers_in.last_modified->value.data, |
|
1947
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
4256 u->headers_in.last_modified->value.len); |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4257 |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4258 if (lm != NGX_ERROR) { |
|
1947
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
4259 ext.time = lm; |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
4260 ext.fd = tf->file.fd; |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4261 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4262 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4263 |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
4264 if (u->conf->store_lengths == NULL) { |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
4265 |
|
5770
9de5820bb3e0
Upstream: ngx_http_upstream_store() error handling fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5757
diff
changeset
|
4266 if (ngx_http_map_uri_to_path(r, &path, &root, 0) == NULL) { |
|
9de5820bb3e0
Upstream: ngx_http_upstream_store() error handling fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5757
diff
changeset
|
4267 return; |
|
9de5820bb3e0
Upstream: ngx_http_upstream_store() error handling fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5757
diff
changeset
|
4268 } |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
4269 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
4270 } else { |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
4271 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
|
4272 u->conf->store_values->elts) |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
4273 == NULL) |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
4274 { |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
4275 return; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
4276 } |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
4277 } |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4278 |
|
3032
524ba56ba9f7
fix copy destination name length, introduced in r3025
Igor Sysoev <igor@sysoev.ru>
parents:
3024
diff
changeset
|
4279 path.len--; |
|
524ba56ba9f7
fix copy destination name length, introduced in r3025
Igor Sysoev <igor@sysoev.ru>
parents:
3024
diff
changeset
|
4280 |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4281 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
|
4282 "upstream stores \"%s\" to \"%s\"", |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
4283 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
|
4284 |
|
94b03bbd328e
use ngx_ext_rename_file() in proxy/fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1916
diff
changeset
|
4285 (void) ngx_ext_rename_file(&tf->file.name, &path, &ext); |
|
5770
9de5820bb3e0
Upstream: ngx_http_upstream_store() error handling fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5757
diff
changeset
|
4286 |
|
9de5820bb3e0
Upstream: ngx_http_upstream_store() error handling fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5757
diff
changeset
|
4287 u->store = 0; |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4288 } |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4289 |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4290 |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1284
diff
changeset
|
4291 static void |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
4292 ngx_http_upstream_dummy_handler(ngx_http_request_t *r, ngx_http_upstream_t *u) |
| 479 | 4293 { |
|
2386
4ccaa42de633
use already available r and u instead of ev
Igor Sysoev <igor@sysoev.ru>
parents:
2381
diff
changeset
|
4294 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 479 | 4295 "http upstream dummy handler"); |
| 4296 } | |
| 4297 | |
| 4298 | |
| 487 | 4299 static void |
| 4300 ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u, | |
| 4301 ngx_uint_t ft_type) | |
| 479 | 4302 { |
|
5832
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5827
diff
changeset
|
4303 ngx_msec_t timeout; |
| 884 | 4304 ngx_uint_t status, state; |
| 479 | 4305 |
| 4306 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 884 | 4307 "http next upstream, %xi", ft_type); |
| 479 | 4308 |
|
5132
9bcf89ca78d2
Upstream: only call peer.free() if peer.get() selected a peer.
Ruslan Ermilov <ru@nginx.com>
parents:
5121
diff
changeset
|
4309 if (u->peer.sockaddr) { |
|
9bcf89ca78d2
Upstream: only call peer.free() if peer.get() selected a peer.
Ruslan Ermilov <ru@nginx.com>
parents:
5121
diff
changeset
|
4310 |
|
7429
e573d74299a0
Upstream: implemented $upstream_bytes_sent.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
4311 if (u->peer.connection) { |
|
e573d74299a0
Upstream: implemented $upstream_bytes_sent.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
4312 u->state->bytes_sent = u->peer.connection->sent; |
|
e573d74299a0
Upstream: implemented $upstream_bytes_sent.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
4313 } |
|
e573d74299a0
Upstream: implemented $upstream_bytes_sent.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
4314 |
|
5231
05c53652e7b4
Upstream: http_403 support in proxy_next_upstream (and friends).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5217
diff
changeset
|
4315 if (ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_403 |
|
05c53652e7b4
Upstream: http_403 support in proxy_next_upstream (and friends).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5217
diff
changeset
|
4316 || ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_404) |
|
05c53652e7b4
Upstream: http_403 support in proxy_next_upstream (and friends).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5217
diff
changeset
|
4317 { |
|
5132
9bcf89ca78d2
Upstream: only call peer.free() if peer.get() selected a peer.
Ruslan Ermilov <ru@nginx.com>
parents:
5121
diff
changeset
|
4318 state = NGX_PEER_NEXT; |
|
5231
05c53652e7b4
Upstream: http_403 support in proxy_next_upstream (and friends).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5217
diff
changeset
|
4319 |
|
5132
9bcf89ca78d2
Upstream: only call peer.free() if peer.get() selected a peer.
Ruslan Ermilov <ru@nginx.com>
parents:
5121
diff
changeset
|
4320 } else { |
|
9bcf89ca78d2
Upstream: only call peer.free() if peer.get() selected a peer.
Ruslan Ermilov <ru@nginx.com>
parents:
5121
diff
changeset
|
4321 state = NGX_PEER_FAILED; |
|
9bcf89ca78d2
Upstream: only call peer.free() if peer.get() selected a peer.
Ruslan Ermilov <ru@nginx.com>
parents:
5121
diff
changeset
|
4322 } |
|
9bcf89ca78d2
Upstream: only call peer.free() if peer.get() selected a peer.
Ruslan Ermilov <ru@nginx.com>
parents:
5121
diff
changeset
|
4323 |
| 1378 | 4324 u->peer.free(&u->peer, u->peer.data, state); |
|
5132
9bcf89ca78d2
Upstream: only call peer.free() if peer.get() selected a peer.
Ruslan Ermilov <ru@nginx.com>
parents:
5121
diff
changeset
|
4325 u->peer.sockaddr = NULL; |
| 1378 | 4326 } |
| 525 | 4327 |
| 479 | 4328 if (ft_type == NGX_HTTP_UPSTREAM_FT_TIMEOUT) { |
| 4329 ngx_log_error(NGX_LOG_ERR, r->connection->log, NGX_ETIMEDOUT, | |
| 4330 "upstream timed out"); | |
| 4331 } | |
| 577 | 4332 |
|
6466
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4333 if (u->peer.cached && ft_type == NGX_HTTP_UPSTREAM_FT_ERROR) { |
|
4115
70a45a504905
Workaround for cpu hog on errors with cached connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4114
diff
changeset
|
4334 /* TODO: inform balancer instead */ |
|
70a45a504905
Workaround for cpu hog on errors with cached connections.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4114
diff
changeset
|
4335 u->peer.tries++; |
|
6466
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4336 } |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4337 |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4338 switch (ft_type) { |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4339 |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4340 case NGX_HTTP_UPSTREAM_FT_TIMEOUT: |
|
7130
882ad033d43c
Upstream: fixed $upstream_status when upstream returns 503/504.
Ruslan Ermilov <ru@nginx.com>
parents:
7126
diff
changeset
|
4341 case NGX_HTTP_UPSTREAM_FT_HTTP_504: |
|
6466
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4342 status = NGX_HTTP_GATEWAY_TIME_OUT; |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4343 break; |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4344 |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4345 case NGX_HTTP_UPSTREAM_FT_HTTP_500: |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4346 status = NGX_HTTP_INTERNAL_SERVER_ERROR; |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4347 break; |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4348 |
|
7130
882ad033d43c
Upstream: fixed $upstream_status when upstream returns 503/504.
Ruslan Ermilov <ru@nginx.com>
parents:
7126
diff
changeset
|
4349 case NGX_HTTP_UPSTREAM_FT_HTTP_503: |
|
882ad033d43c
Upstream: fixed $upstream_status when upstream returns 503/504.
Ruslan Ermilov <ru@nginx.com>
parents:
7126
diff
changeset
|
4350 status = NGX_HTTP_SERVICE_UNAVAILABLE; |
|
882ad033d43c
Upstream: fixed $upstream_status when upstream returns 503/504.
Ruslan Ermilov <ru@nginx.com>
parents:
7126
diff
changeset
|
4351 break; |
|
882ad033d43c
Upstream: fixed $upstream_status when upstream returns 503/504.
Ruslan Ermilov <ru@nginx.com>
parents:
7126
diff
changeset
|
4352 |
|
6466
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4353 case NGX_HTTP_UPSTREAM_FT_HTTP_403: |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4354 status = NGX_HTTP_FORBIDDEN; |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4355 break; |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4356 |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4357 case NGX_HTTP_UPSTREAM_FT_HTTP_404: |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4358 status = NGX_HTTP_NOT_FOUND; |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4359 break; |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4360 |
|
6966
fa56ab75cffc
Upstream: allow recovery from "429 Too Many Requests" response.
Piotr Sikora <piotrsikora@google.com>
parents:
6961
diff
changeset
|
4361 case NGX_HTTP_UPSTREAM_FT_HTTP_429: |
|
fa56ab75cffc
Upstream: allow recovery from "429 Too Many Requests" response.
Piotr Sikora <piotrsikora@google.com>
parents:
6961
diff
changeset
|
4362 status = NGX_HTTP_TOO_MANY_REQUESTS; |
|
fa56ab75cffc
Upstream: allow recovery from "429 Too Many Requests" response.
Piotr Sikora <piotrsikora@google.com>
parents:
6961
diff
changeset
|
4363 break; |
|
fa56ab75cffc
Upstream: allow recovery from "429 Too Many Requests" response.
Piotr Sikora <piotrsikora@google.com>
parents:
6961
diff
changeset
|
4364 |
|
6466
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4365 /* |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4366 * NGX_HTTP_UPSTREAM_FT_BUSY_LOCK and NGX_HTTP_UPSTREAM_FT_MAX_WAITING |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4367 * never reach here |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4368 */ |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4369 |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4370 default: |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4371 status = NGX_HTTP_BAD_GATEWAY; |
| 479 | 4372 } |
| 4373 | |
| 583 | 4374 if (r->connection->error) { |
| 479 | 4375 ngx_http_upstream_finalize_request(r, u, |
| 4376 NGX_HTTP_CLIENT_CLOSED_REQUEST); | |
| 4377 return; | |
| 4378 } | |
| 4379 | |
|
6466
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4380 u->state->status = status; |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4381 |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4382 timeout = u->conf->next_upstream_timeout; |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4383 |
|
6467
91c8d990fb45
Upstream: proxy_next_upstream non_idempotent.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6466
diff
changeset
|
4384 if (u->request_sent |
|
91c8d990fb45
Upstream: proxy_next_upstream non_idempotent.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6466
diff
changeset
|
4385 && (r->method & (NGX_HTTP_POST|NGX_HTTP_LOCK|NGX_HTTP_PATCH))) |
|
91c8d990fb45
Upstream: proxy_next_upstream non_idempotent.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6466
diff
changeset
|
4386 { |
|
91c8d990fb45
Upstream: proxy_next_upstream non_idempotent.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6466
diff
changeset
|
4387 ft_type |= NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT; |
|
91c8d990fb45
Upstream: proxy_next_upstream non_idempotent.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6466
diff
changeset
|
4388 } |
|
91c8d990fb45
Upstream: proxy_next_upstream non_idempotent.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6466
diff
changeset
|
4389 |
|
6466
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4390 if (u->peer.tries == 0 |
|
6467
91c8d990fb45
Upstream: proxy_next_upstream non_idempotent.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6466
diff
changeset
|
4391 || ((u->conf->next_upstream & ft_type) != ft_type) |
|
6466
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4392 || (u->request_sent && r->request_body_no_buffering) |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4393 || (timeout && ngx_current_msec - u->peer.start_time >= timeout)) |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4394 { |
| 479 | 4395 #if (NGX_HTTP_CACHE) |
| 4396 | |
|
6466
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4397 if (u->cache_status == NGX_HTTP_CACHE_EXPIRED |
|
6905
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4398 && ((u->conf->cache_use_stale & ft_type) || r->cache->stale_error)) |
|
6466
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4399 { |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4400 ngx_int_t rc; |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4401 |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4402 rc = u->reinit_request(r); |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4403 |
|
7126
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
4404 if (rc != NGX_OK) { |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
4405 ngx_http_upstream_finalize_request(r, u, rc); |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
4406 return; |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
4407 } |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
4408 |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
4409 u->cache_status = NGX_HTTP_CACHE_STALE; |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
4410 rc = ngx_http_upstream_cache_send(r, u); |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
4411 |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
4412 if (rc == NGX_DONE) { |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
4413 return; |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
4414 } |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
4415 |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
4416 if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) { |
|
77fe752b4586
Upstream: fixed error handling of stale and revalidated cache send.
Sergey Kandaurov <pluknet@nginx.com>
parents:
7125
diff
changeset
|
4417 rc = NGX_HTTP_INTERNAL_SERVER_ERROR; |
| 479 | 4418 } |
|
6466
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4419 |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4420 ngx_http_upstream_finalize_request(r, u, rc); |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4421 return; |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4422 } |
| 479 | 4423 #endif |
| 4424 | |
|
6466
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4425 ngx_http_upstream_finalize_request(r, u, status); |
|
984687f25998
Upstream: cached connections now tested against next_upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6443
diff
changeset
|
4426 return; |
| 479 | 4427 } |
| 4428 | |
| 4429 if (u->peer.connection) { | |
| 4430 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 4431 "close http upstream connection: %d", | |
| 4432 u->peer.connection->fd); | |
| 577 | 4433 #if (NGX_HTTP_SSL) |
| 884 | 4434 |
| 577 | 4435 if (u->peer.connection->ssl) { |
| 884 | 4436 u->peer.connection->ssl->no_wait_shutdown = 1; |
| 4437 u->peer.connection->ssl->no_send_shutdown = 1; | |
| 4438 | |
| 4439 (void) ngx_ssl_shutdown(u->peer.connection); | |
| 577 | 4440 } |
| 4441 #endif | |
| 884 | 4442 |
|
4138
70e1ee2307f9
Fix of separate pool for upstream connections (r4117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4124
diff
changeset
|
4443 if (u->peer.connection->pool) { |
|
70e1ee2307f9
Fix of separate pool for upstream connections (r4117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4124
diff
changeset
|
4444 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
|
4445 } |
|
70e1ee2307f9
Fix of separate pool for upstream connections (r4117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4124
diff
changeset
|
4446 |
| 479 | 4447 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
|
4448 u->peer.connection = NULL; |
| 479 | 4449 } |
| 4450 | |
| 4451 ngx_http_upstream_connect(r, u); | |
| 4452 } | |
| 4453 | |
| 4454 | |
| 487 | 4455 static void |
| 569 | 4456 ngx_http_upstream_cleanup(void *data) |
| 4457 { | |
| 4458 ngx_http_request_t *r = data; | |
| 4459 | |
| 4460 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 4461 "cleanup http upstream request: \"%V\"", &r->uri); | |
| 4462 | |
|
5167
85ee9d858dcb
Upstream: removed surplus ngx_resolve_name_done() call.
Valentin Bartenev <vbart@nginx.com>
parents:
5142
diff
changeset
|
4463 ngx_http_upstream_finalize_request(r, r->upstream, NGX_DONE); |
| 569 | 4464 } |
| 4465 | |
| 4466 | |
| 4467 static void | |
| 487 | 4468 ngx_http_upstream_finalize_request(ngx_http_request_t *r, |
| 4469 ngx_http_upstream_t *u, ngx_int_t rc) | |
| 479 | 4470 { |
|
6146
59fc60585f1e
Upstream: times to obtain header/response are stored as ngx_msec_t.
Ruslan Ermilov <ru@nginx.com>
parents:
6125
diff
changeset
|
4471 ngx_uint_t flush; |
| 563 | 4472 |
| 483 | 4473 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 4474 "finalize http upstream request: %i", rc); | |
| 479 | 4475 |
|
5994
5abf5af257a7
Upstream: avoid duplicate finalization.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5992
diff
changeset
|
4476 if (u->cleanup == NULL) { |
|
5abf5af257a7
Upstream: avoid duplicate finalization.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5992
diff
changeset
|
4477 /* the request was already finalized */ |
|
5abf5af257a7
Upstream: avoid duplicate finalization.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5992
diff
changeset
|
4478 ngx_http_finalize_request(r, NGX_DONE); |
|
5abf5af257a7
Upstream: avoid duplicate finalization.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5992
diff
changeset
|
4479 return; |
|
5abf5af257a7
Upstream: avoid duplicate finalization.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5992
diff
changeset
|
4480 } |
|
5abf5af257a7
Upstream: avoid duplicate finalization.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5992
diff
changeset
|
4481 |
|
5abf5af257a7
Upstream: avoid duplicate finalization.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5992
diff
changeset
|
4482 *u->cleanup = NULL; |
|
5abf5af257a7
Upstream: avoid duplicate finalization.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5992
diff
changeset
|
4483 u->cleanup = NULL; |
| 569 | 4484 |
|
3169
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
4485 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
|
4486 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
|
4487 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
|
4488 } |
|
b1013d768911
fix request counter in resolver handling, the bug was introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3161
diff
changeset
|
4489 |
|
7397
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
4490 if (u->state && u->state->response_time == (ngx_msec_t) -1) { |
|
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
4491 u->state->response_time = ngx_current_msec - u->start_time; |
| 2402 | 4492 |
|
5169
f6bbe77794aa
Upstream: fixed $upstream_response_length without buffering.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5167
diff
changeset
|
4493 if (u->pipe && u->pipe->read_length) { |
|
6654
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
4494 u->state->bytes_received += u->pipe->read_length |
|
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
4495 - u->pipe->preread_size; |
| 2402 | 4496 u->state->response_length = u->pipe->read_length; |
| 4497 } | |
|
7429
e573d74299a0
Upstream: implemented $upstream_bytes_sent.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
4498 |
|
e573d74299a0
Upstream: implemented $upstream_bytes_sent.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
4499 if (u->peer.connection) { |
|
e573d74299a0
Upstream: implemented $upstream_bytes_sent.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
4500 u->state->bytes_sent = u->peer.connection->sent; |
|
e573d74299a0
Upstream: implemented $upstream_bytes_sent.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
4501 } |
| 563 | 4502 } |
| 4503 | |
| 479 | 4504 u->finalize_request(r, rc); |
| 4505 | |
|
5132
9bcf89ca78d2
Upstream: only call peer.free() if peer.get() selected a peer.
Ruslan Ermilov <ru@nginx.com>
parents:
5121
diff
changeset
|
4506 if (u->peer.free && u->peer.sockaddr) { |
| 1658 | 4507 u->peer.free(&u->peer, u->peer.data, 0); |
|
5132
9bcf89ca78d2
Upstream: only call peer.free() if peer.get() selected a peer.
Ruslan Ermilov <ru@nginx.com>
parents:
5121
diff
changeset
|
4508 u->peer.sockaddr = NULL; |
| 1658 | 4509 } |
| 884 | 4510 |
| 479 | 4511 if (u->peer.connection) { |
| 884 | 4512 |
| 577 | 4513 #if (NGX_HTTP_SSL) |
| 4514 | |
| 4515 /* TODO: do not shutdown persistent connection */ | |
| 4516 | |
| 4517 if (u->peer.connection->ssl) { | |
| 884 | 4518 |
| 4519 /* | |
| 4520 * We send the "close notify" shutdown alert to the upstream only | |
| 4521 * and do not wait its "close notify" shutdown alert. | |
| 4522 * It is acceptable according to the TLS standard. | |
| 4523 */ | |
| 4524 | |
| 4525 u->peer.connection->ssl->no_wait_shutdown = 1; | |
| 4526 | |
| 4527 (void) ngx_ssl_shutdown(u->peer.connection); | |
| 577 | 4528 } |
| 4529 #endif | |
| 884 | 4530 |
| 4531 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 4532 "close http upstream connection: %d", | |
| 4533 u->peer.connection->fd); | |
| 4534 | |
|
4138
70e1ee2307f9
Fix of separate pool for upstream connections (r4117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4124
diff
changeset
|
4535 if (u->peer.connection->pool) { |
|
70e1ee2307f9
Fix of separate pool for upstream connections (r4117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4124
diff
changeset
|
4536 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
|
4537 } |
|
70e1ee2307f9
Fix of separate pool for upstream connections (r4117).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4124
diff
changeset
|
4538 |
| 479 | 4539 ngx_close_connection(u->peer.connection); |
| 4540 } | |
| 4541 | |
| 483 | 4542 u->peer.connection = NULL; |
| 4543 | |
| 581 | 4544 if (u->pipe && u->pipe->temp_file) { |
| 479 | 4545 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 4546 "http upstream temp fd: %d", | |
| 581 | 4547 u->pipe->temp_file->file.fd); |
| 479 | 4548 } |
| 4549 | |
|
4469
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
4550 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
|
4551 && 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
|
4552 { |
|
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
4553 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
|
4554 == NGX_FILE_ERROR) |
|
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
4555 { |
|
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
4556 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
|
4557 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
|
4558 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
|
4559 } |
|
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
4560 } |
|
24c0dca04eb9
Fix for proxy_store leaving temporary files for subrequests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4464
diff
changeset
|
4561 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
4562 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
4563 |
|
3940
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
4564 if (r->cache) { |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
4565 |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
4566 if (u->cacheable) { |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
4567 |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
4568 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
|
4569 time_t valid; |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
4570 |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
4571 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
|
4572 |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
4573 if (valid) { |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
4574 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
|
4575 r->cache->error = rc; |
|
22f3e9197096
revert r3935 and fix "stalled cache updating" alert
Igor Sysoev <igor@sysoev.ru>
parents:
3934
diff
changeset
|
4576 } |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
4577 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
4578 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
4579 |
|
3711
ce6ba077c270
several changes in cache cleanup handling:
Igor Sysoev <igor@sysoev.ru>
parents:
3709
diff
changeset
|
4580 ngx_http_file_cache_free(r->cache, u->pipe->temp_file); |
| 479 | 4581 } |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
4582 |
| 479 | 4583 #endif |
| 4584 | |
|
6909
5850fed24639
Upstream: read handler cleared on upstream finalization.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6906
diff
changeset
|
4585 r->read_event_handler = ngx_http_block_reading; |
|
5850fed24639
Upstream: read handler cleared on upstream finalization.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6906
diff
changeset
|
4586 |
| 515 | 4587 if (rc == NGX_DECLINED) { |
| 4588 return; | |
| 4589 } | |
| 4590 | |
| 483 | 4591 r->connection->log->action = "sending to client"; |
| 4592 | |
|
5303
0fb714d80909
Upstream: request finalization rework.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5302
diff
changeset
|
4593 if (!u->header_sent |
|
0fb714d80909
Upstream: request finalization rework.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5302
diff
changeset
|
4594 || rc == NGX_HTTP_REQUEST_TIME_OUT |
|
7188
93abb5a855d6
Upstream: fixed "header already sent" alerts on backend errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7174
diff
changeset
|
4595 || rc == NGX_HTTP_CLIENT_CLOSED_REQUEST) |
|
4151
3549db8ceaf2
Cache: fix for sending of stale responses.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4143
diff
changeset
|
4596 { |
|
5303
0fb714d80909
Upstream: request finalization rework.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5302
diff
changeset
|
4597 ngx_http_finalize_request(r, rc); |
|
0fb714d80909
Upstream: request finalization rework.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5302
diff
changeset
|
4598 return; |
|
0fb714d80909
Upstream: request finalization rework.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5302
diff
changeset
|
4599 } |
|
0fb714d80909
Upstream: request finalization rework.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5302
diff
changeset
|
4600 |
|
5304
d3eab5e2df5f
Upstream: no last buffer on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5303
diff
changeset
|
4601 flush = 0; |
|
d3eab5e2df5f
Upstream: no last buffer on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5303
diff
changeset
|
4602 |
|
d3eab5e2df5f
Upstream: no last buffer on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5303
diff
changeset
|
4603 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) { |
|
d3eab5e2df5f
Upstream: no last buffer on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5303
diff
changeset
|
4604 rc = NGX_ERROR; |
|
d3eab5e2df5f
Upstream: no last buffer on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5303
diff
changeset
|
4605 flush = 1; |
|
5303
0fb714d80909
Upstream: request finalization rework.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5302
diff
changeset
|
4606 } |
|
0fb714d80909
Upstream: request finalization rework.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5302
diff
changeset
|
4607 |
|
7188
93abb5a855d6
Upstream: fixed "header already sent" alerts on backend errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7174
diff
changeset
|
4608 if (r->header_only |
|
93abb5a855d6
Upstream: fixed "header already sent" alerts on backend errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7174
diff
changeset
|
4609 || (u->pipe && u->pipe->downstream_error)) |
|
93abb5a855d6
Upstream: fixed "header already sent" alerts on backend errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7174
diff
changeset
|
4610 { |
|
5303
0fb714d80909
Upstream: request finalization rework.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5302
diff
changeset
|
4611 ngx_http_finalize_request(r, rc); |
|
0fb714d80909
Upstream: request finalization rework.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5302
diff
changeset
|
4612 return; |
|
0fb714d80909
Upstream: request finalization rework.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5302
diff
changeset
|
4613 } |
|
0fb714d80909
Upstream: request finalization rework.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5302
diff
changeset
|
4614 |
|
0fb714d80909
Upstream: request finalization rework.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5302
diff
changeset
|
4615 if (rc == 0) { |
|
7230
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
4616 |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
4617 if (ngx_http_upstream_process_trailers(r, u) != NGX_OK) { |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
4618 ngx_http_finalize_request(r, NGX_ERROR); |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
4619 return; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
4620 } |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
4621 |
|
2377
87b8c44906b5
*) refactor subrequest handling, now they run as separate posted requests
Igor Sysoev <igor@sysoev.ru>
parents:
2360
diff
changeset
|
4622 rc = ngx_http_send_special(r, NGX_HTTP_LAST); |
|
5304
d3eab5e2df5f
Upstream: no last buffer on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5303
diff
changeset
|
4623 |
|
d3eab5e2df5f
Upstream: no last buffer on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5303
diff
changeset
|
4624 } else if (flush) { |
|
d3eab5e2df5f
Upstream: no last buffer on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5303
diff
changeset
|
4625 r->keepalive = 0; |
|
d3eab5e2df5f
Upstream: no last buffer on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5303
diff
changeset
|
4626 rc = ngx_http_send_special(r, NGX_HTTP_FLUSH); |
| 479 | 4627 } |
| 4628 | |
| 4629 ngx_http_finalize_request(r, rc); | |
| 4630 } | |
| 4631 | |
| 4632 | |
| 509 | 4633 static ngx_int_t |
| 4634 ngx_http_upstream_process_header_line(ngx_http_request_t *r, ngx_table_elt_t *h, | |
| 4635 ngx_uint_t offset) | |
| 577 | 4636 { |
| 509 | 4637 ngx_table_elt_t **ph; |
| 577 | 4638 |
| 509 | 4639 ph = (ngx_table_elt_t **) ((char *) &r->upstream->headers_in + offset); |
| 4640 | |
|
8034
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4641 if (*ph) { |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4642 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0, |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4643 "upstream sent duplicate header line: \"%V: %V\", " |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4644 "previous value: \"%V: %V\", ignored", |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4645 &h->key, &h->value, |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4646 &(*ph)->key, &(*ph)->value); |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4647 h->hash = 0; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4648 return NGX_OK; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4649 } |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4650 |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4651 *ph = h; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4652 h->next = NULL; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4653 |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4654 return NGX_OK; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4655 } |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4656 |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4657 |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4658 static ngx_int_t |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4659 ngx_http_upstream_process_multi_header_lines(ngx_http_request_t *r, |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4660 ngx_table_elt_t *h, ngx_uint_t offset) |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4661 { |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4662 ngx_table_elt_t **ph; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4663 |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4664 ph = (ngx_table_elt_t **) ((char *) &r->upstream->headers_in + offset); |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4665 |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4666 while (*ph) { ph = &(*ph)->next; } |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4667 |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4668 *ph = h; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4669 h->next = NULL; |
| 509 | 4670 |
| 4671 return NGX_OK; | |
| 4672 } | |
| 4673 | |
| 4674 | |
| 4675 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
|
4676 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
|
4677 ngx_uint_t offset) |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
4678 { |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
4679 return NGX_OK; |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
4680 } |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
4681 |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
4682 |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
4683 static ngx_int_t |
|
4117
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
4684 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
|
4685 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
|
4686 { |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
4687 ngx_http_upstream_t *u; |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
4688 |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
4689 u = r->upstream; |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
4690 |
|
8033
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4691 if (u->headers_in.content_length) { |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4692 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4693 "upstream sent duplicate header line: \"%V: %V\", " |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4694 "previous value: \"%V: %V\"", |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4695 &h->key, &h->value, |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4696 &u->headers_in.content_length->key, |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4697 &u->headers_in.content_length->value); |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4698 return NGX_HTTP_UPSTREAM_INVALID_HEADER; |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4699 } |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4700 |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4701 if (u->headers_in.transfer_encoding) { |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4702 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4703 "upstream sent \"Content-Length\" and " |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4704 "\"Transfer-Encoding\" headers at the same time"); |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4705 return NGX_HTTP_UPSTREAM_INVALID_HEADER; |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4706 } |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4707 |
|
8032
2025aae94739
Upstream: all known headers in u->headers_in are linked lists now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8031
diff
changeset
|
4708 h->next = NULL; |
|
4117
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
4709 u->headers_in.content_length = h; |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
4710 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
|
4711 |
|
8033
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4712 if (u->headers_in.content_length_n == NGX_ERROR) { |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4713 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4714 "upstream sent invalid \"Content-Length\" header: " |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4715 "\"%V: %V\"", &h->key, &h->value); |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4716 return NGX_HTTP_UPSTREAM_INVALID_HEADER; |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4717 } |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
4718 |
|
4117
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
4719 return NGX_OK; |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
4720 } |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
4721 |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
4722 |
|
103b0d9afe07
Upstream: content_length_n API change.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4116
diff
changeset
|
4723 static ngx_int_t |
|
5732
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
4724 ngx_http_upstream_process_last_modified(ngx_http_request_t *r, |
|
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
4725 ngx_table_elt_t *h, ngx_uint_t offset) |
|
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
4726 { |
|
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
4727 ngx_http_upstream_t *u; |
|
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
4728 |
|
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
4729 u = r->upstream; |
|
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
4730 |
|
8034
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4731 if (u->headers_in.last_modified) { |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4732 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0, |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4733 "upstream sent duplicate header line: \"%V: %V\", " |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4734 "previous value: \"%V: %V\", ignored", |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4735 &h->key, &h->value, |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4736 &u->headers_in.last_modified->key, |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4737 &u->headers_in.last_modified->value); |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4738 h->hash = 0; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4739 return NGX_OK; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4740 } |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4741 |
|
8032
2025aae94739
Upstream: all known headers in u->headers_in are linked lists now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8031
diff
changeset
|
4742 h->next = NULL; |
|
5732
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
4743 u->headers_in.last_modified = h; |
|
7093
acc2cddc7b45
Upstream: unconditional parsing of last_modified_time.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7077
diff
changeset
|
4744 u->headers_in.last_modified_time = ngx_parse_http_time(h->value.data, |
|
acc2cddc7b45
Upstream: unconditional parsing of last_modified_time.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7077
diff
changeset
|
4745 h->value.len); |
|
5732
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
4746 |
|
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
4747 return NGX_OK; |
|
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
4748 } |
|
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
4749 |
|
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
4750 |
|
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
4751 static ngx_int_t |
|
3669
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
4752 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
|
4753 ngx_uint_t offset) |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
4754 { |
|
5677
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
4755 ngx_table_elt_t **ph; |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
4756 ngx_http_upstream_t *u; |
|
3669
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
4757 |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
4758 u = r->upstream; |
|
8024
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8023
diff
changeset
|
4759 ph = &u->headers_in.set_cookie; |
|
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8023
diff
changeset
|
4760 |
|
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8023
diff
changeset
|
4761 while (*ph) { ph = &(*ph)->next; } |
|
5677
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
4762 |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
4763 *ph = h; |
|
8024
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8023
diff
changeset
|
4764 h->next = NULL; |
|
5677
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
4765 |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
4766 #if (NGX_HTTP_CACHE) |
|
3669
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
4767 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
|
4768 u->cacheable = 0; |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
4769 } |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
4770 #endif |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
4771 |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
4772 return NGX_OK; |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
4773 } |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
4774 |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
4775 |
|
1f5841b1fcd7
treat Set-Cookie as a header that forbids caching
Igor Sysoev <igor@sysoev.ru>
parents:
3667
diff
changeset
|
4776 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
|
4777 ngx_http_upstream_process_cache_control(ngx_http_request_t *r, |
| 509 | 4778 ngx_table_elt_t *h, ngx_uint_t offset) |
| 4779 { | |
| 8028 | 4780 ngx_table_elt_t **ph; |
| 4781 ngx_http_upstream_t *u; | |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4782 |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4783 u = r->upstream; |
|
8024
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8023
diff
changeset
|
4784 ph = &u->headers_in.cache_control; |
|
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8023
diff
changeset
|
4785 |
|
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8023
diff
changeset
|
4786 while (*ph) { ph = &(*ph)->next; } |
| 509 | 4787 |
| 4788 *ph = h; | |
|
8024
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8023
diff
changeset
|
4789 h->next = NULL; |
| 509 | 4790 |
|
2708
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
4791 #if (NGX_HTTP_CACHE) |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
4792 { |
|
5911
88d55e5934f7
Cache: add support for Cache-Control's s-maxage response directive.
Piotr Sikora <piotr@cloudflare.com>
parents:
5905
diff
changeset
|
4793 u_char *p, *start, *last; |
|
2708
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
4794 ngx_int_t n; |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
4795 |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4796 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
|
4797 return NGX_OK; |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4798 } |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4799 |
|
2669
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
4800 if (r->cache == NULL) { |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
4801 return NGX_OK; |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
4802 } |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
4803 |
|
5911
88d55e5934f7
Cache: add support for Cache-Control's s-maxage response directive.
Piotr Sikora <piotr@cloudflare.com>
parents:
5905
diff
changeset
|
4804 start = h->value.data; |
|
88d55e5934f7
Cache: add support for Cache-Control's s-maxage response directive.
Piotr Sikora <piotr@cloudflare.com>
parents:
5905
diff
changeset
|
4805 last = start + h->value.len; |
|
88d55e5934f7
Cache: add support for Cache-Control's s-maxage response directive.
Piotr Sikora <piotr@cloudflare.com>
parents:
5905
diff
changeset
|
4806 |
|
8041
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
4807 if (r->cache->valid_sec != 0 && u->headers_in.x_accel_expires != NULL) { |
|
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
4808 goto extensions; |
|
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
4809 } |
|
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
4810 |
|
5911
88d55e5934f7
Cache: add support for Cache-Control's s-maxage response directive.
Piotr Sikora <piotr@cloudflare.com>
parents:
5905
diff
changeset
|
4811 if (ngx_strlcasestrn(start, last, (u_char *) "no-cache", 8 - 1) != NULL |
|
88d55e5934f7
Cache: add support for Cache-Control's s-maxage response directive.
Piotr Sikora <piotr@cloudflare.com>
parents:
5905
diff
changeset
|
4812 || ngx_strlcasestrn(start, last, (u_char *) "no-store", 8 - 1) != NULL |
|
88d55e5934f7
Cache: add support for Cache-Control's s-maxage response directive.
Piotr Sikora <piotr@cloudflare.com>
parents:
5905
diff
changeset
|
4813 || ngx_strlcasestrn(start, 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
|
4814 { |
|
8041
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
4815 u->headers_in.no_cache = 1; |
|
2669
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
4816 return NGX_OK; |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
4817 } |
|
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
4818 |
|
5911
88d55e5934f7
Cache: add support for Cache-Control's s-maxage response directive.
Piotr Sikora <piotr@cloudflare.com>
parents:
5905
diff
changeset
|
4819 p = ngx_strlcasestrn(start, last, (u_char *) "s-maxage=", 9 - 1); |
|
88d55e5934f7
Cache: add support for Cache-Control's s-maxage response directive.
Piotr Sikora <piotr@cloudflare.com>
parents:
5905
diff
changeset
|
4820 offset = 9; |
|
88d55e5934f7
Cache: add support for Cache-Control's s-maxage response directive.
Piotr Sikora <piotr@cloudflare.com>
parents:
5905
diff
changeset
|
4821 |
|
88d55e5934f7
Cache: add support for Cache-Control's s-maxage response directive.
Piotr Sikora <piotr@cloudflare.com>
parents:
5905
diff
changeset
|
4822 if (p == NULL) { |
|
88d55e5934f7
Cache: add support for Cache-Control's s-maxage response directive.
Piotr Sikora <piotr@cloudflare.com>
parents:
5905
diff
changeset
|
4823 p = ngx_strlcasestrn(start, last, (u_char *) "max-age=", 8 - 1); |
|
88d55e5934f7
Cache: add support for Cache-Control's s-maxage response directive.
Piotr Sikora <piotr@cloudflare.com>
parents:
5905
diff
changeset
|
4824 offset = 8; |
|
88d55e5934f7
Cache: add support for Cache-Control's s-maxage response directive.
Piotr Sikora <piotr@cloudflare.com>
parents:
5905
diff
changeset
|
4825 } |
|
2669
5e4d8bd4486c
support Cache-Control no-cache and max-age in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2667
diff
changeset
|
4826 |
|
6905
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4827 if (p) { |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4828 n = 0; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4829 |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4830 for (p += offset; p < last; p++) { |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4831 if (*p == ',' || *p == ';' || *p == ' ') { |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4832 break; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4833 } |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4834 |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4835 if (*p >= '0' && *p <= '9') { |
|
7067
e3723f2a11b7
Parenthesized ASCII-related calculations.
Valentin Bartenev <vbart@nginx.com>
parents:
7042
diff
changeset
|
4836 n = n * 10 + (*p - '0'); |
|
6905
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4837 continue; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4838 } |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4839 |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4840 u->cacheable = 0; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4841 return NGX_OK; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4842 } |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4843 |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4844 if (n == 0) { |
|
8041
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
4845 u->headers_in.no_cache = 1; |
|
6905
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4846 return NGX_OK; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4847 } |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4848 |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4849 r->cache->valid_sec = ngx_time() + n; |
|
8041
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
4850 u->headers_in.expired = 0; |
|
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
4851 } |
|
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
4852 |
|
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
4853 extensions: |
|
6905
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4854 |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4855 p = ngx_strlcasestrn(start, last, (u_char *) "stale-while-revalidate=", |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4856 23 - 1); |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4857 |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4858 if (p) { |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4859 n = 0; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4860 |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4861 for (p += 23; p < last; p++) { |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4862 if (*p == ',' || *p == ';' || *p == ' ') { |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4863 break; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4864 } |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4865 |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4866 if (*p >= '0' && *p <= '9') { |
|
7067
e3723f2a11b7
Parenthesized ASCII-related calculations.
Valentin Bartenev <vbart@nginx.com>
parents:
7042
diff
changeset
|
4867 n = n * 10 + (*p - '0'); |
|
6905
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4868 continue; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4869 } |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4870 |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4871 u->cacheable = 0; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4872 return NGX_OK; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4873 } |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4874 |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4875 r->cache->updating_sec = n; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4876 r->cache->error_sec = n; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4877 } |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4878 |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4879 p = ngx_strlcasestrn(start, last, (u_char *) "stale-if-error=", 15 - 1); |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4880 |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4881 if (p) { |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4882 n = 0; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4883 |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4884 for (p += 15; p < last; p++) { |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4885 if (*p == ',' || *p == ';' || *p == ' ') { |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4886 break; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4887 } |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4888 |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4889 if (*p >= '0' && *p <= '9') { |
|
7067
e3723f2a11b7
Parenthesized ASCII-related calculations.
Valentin Bartenev <vbart@nginx.com>
parents:
7042
diff
changeset
|
4890 n = n * 10 + (*p - '0'); |
|
6905
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4891 continue; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4892 } |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4893 |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4894 u->cacheable = 0; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4895 return NGX_OK; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4896 } |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4897 |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4898 r->cache->error_sec = n; |
|
9a9e13686869
Cache: support for stale-while-revalidate and stale-if-error.
Roman Arutyunyan <arut@nginx.com>
parents:
6899
diff
changeset
|
4899 } |
|
2708
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
4900 } |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
4901 #endif |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
4902 |
| 509 | 4903 return NGX_OK; |
| 4904 } | |
| 4905 | |
| 4906 | |
| 4907 static ngx_int_t | |
| 2666 | 4908 ngx_http_upstream_process_expires(ngx_http_request_t *r, ngx_table_elt_t *h, |
| 4909 ngx_uint_t offset) | |
| 4910 { | |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4911 ngx_http_upstream_t *u; |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4912 |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4913 u = r->upstream; |
|
8034
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4914 |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4915 if (u->headers_in.expires) { |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4916 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0, |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4917 "upstream sent duplicate header line: \"%V: %V\", " |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4918 "previous value: \"%V: %V\", ignored", |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4919 &h->key, &h->value, |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4920 &u->headers_in.expires->key, |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4921 &u->headers_in.expires->value); |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4922 h->hash = 0; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4923 return NGX_OK; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4924 } |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4925 |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4926 u->headers_in.expires = h; |
|
8032
2025aae94739
Upstream: all known headers in u->headers_in are linked lists now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8031
diff
changeset
|
4927 h->next = NULL; |
|
2708
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
4928 |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
4929 #if (NGX_HTTP_CACHE) |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
4930 { |
| 2666 | 4931 time_t expires; |
| 4932 | |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4933 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
|
4934 return NGX_OK; |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4935 } |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4936 |
| 2666 | 4937 if (r->cache == NULL) { |
| 4938 return NGX_OK; | |
| 4939 } | |
| 4940 | |
| 4941 if (r->cache->valid_sec != 0) { | |
| 4942 return NGX_OK; | |
| 4943 } | |
| 4944 | |
|
6180
8b6fa4842133
Moved ngx_http_parse_time() to core, renamed accordingly.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6147
diff
changeset
|
4945 expires = ngx_parse_http_time(h->value.data, h->value.len); |
| 2666 | 4946 |
| 4947 if (expires == NGX_ERROR || expires < ngx_time()) { | |
|
8041
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
4948 u->headers_in.expired = 1; |
| 2666 | 4949 return NGX_OK; |
| 4950 } | |
| 4951 | |
| 4952 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
|
4953 } |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
4954 #endif |
| 2666 | 4955 |
| 4956 return NGX_OK; | |
| 4957 } | |
| 4958 | |
| 4959 | |
| 4960 static ngx_int_t | |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
4961 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
|
4962 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
|
4963 { |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4964 ngx_http_upstream_t *u; |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4965 |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4966 u = r->upstream; |
|
8034
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4967 |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4968 if (u->headers_in.x_accel_expires) { |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4969 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0, |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4970 "upstream sent duplicate header line: \"%V: %V\", " |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4971 "previous value: \"%V: %V\", ignored", |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4972 &h->key, &h->value, |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4973 &u->headers_in.x_accel_expires->key, |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4974 &u->headers_in.x_accel_expires->value); |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4975 h->hash = 0; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4976 return NGX_OK; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4977 } |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
4978 |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4979 u->headers_in.x_accel_expires = h; |
|
8032
2025aae94739
Upstream: all known headers in u->headers_in are linked lists now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8031
diff
changeset
|
4980 h->next = NULL; |
|
2708
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
4981 |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
4982 #if (NGX_HTTP_CACHE) |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
4983 { |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
4984 u_char *p; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
4985 size_t len; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
4986 ngx_int_t n; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
4987 |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4988 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
|
4989 return NGX_OK; |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4990 } |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
4991 |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
4992 if (r->cache == NULL) { |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
4993 return NGX_OK; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
4994 } |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
4995 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
4996 len = h->value.len; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
4997 p = h->value.data; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
4998 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
4999 if (p[0] != '@') { |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
5000 n = ngx_atoi(p, len); |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
5001 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
5002 switch (n) { |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
5003 case 0: |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2757
diff
changeset
|
5004 u->cacheable = 0; |
|
4546
4988fa232629
For the sake of case/switch code readability, 'fall through'
Maxim Konovalov <maxim@nginx.com>
parents:
4499
diff
changeset
|
5005 /* fall through */ |
|
4988fa232629
For the sake of case/switch code readability, 'fall through'
Maxim Konovalov <maxim@nginx.com>
parents:
4499
diff
changeset
|
5006 |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
5007 case NGX_ERROR: |
| 2667 | 5008 return NGX_OK; |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
5009 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
5010 default: |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
5011 r->cache->valid_sec = ngx_time() + n; |
|
8041
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
5012 u->headers_in.no_cache = 0; |
|
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
5013 u->headers_in.expired = 0; |
| 2667 | 5014 return NGX_OK; |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
5015 } |
| 2667 | 5016 } |
| 5017 | |
| 5018 p++; | |
| 5019 len--; | |
| 5020 | |
| 5021 n = ngx_atoi(p, len); | |
| 5022 | |
| 5023 if (n != NGX_ERROR) { | |
| 5024 r->cache->valid_sec = n; | |
|
8041
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
5025 u->headers_in.no_cache = 0; |
|
0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8040
diff
changeset
|
5026 u->headers_in.expired = 0; |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
5027 } |
|
2708
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
5028 } |
|
4c658be4ab63
fix building --without-http-cache, introduced in r2664 and later
Igor Sysoev <igor@sysoev.ru>
parents:
2704
diff
changeset
|
5029 #endif |
|
2663
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
5030 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
5031 return NGX_OK; |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
5032 } |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
5033 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
5034 |
|
09725d69cb25
support X-Accel-Expires in cache
Igor Sysoev <igor@sysoev.ru>
parents:
2662
diff
changeset
|
5035 static ngx_int_t |
| 527 | 5036 ngx_http_upstream_process_limit_rate(ngx_http_request_t *r, ngx_table_elt_t *h, |
| 5037 ngx_uint_t offset) | |
| 577 | 5038 { |
|
4197
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5039 ngx_int_t n; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5040 ngx_http_upstream_t *u; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5041 |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5042 u = r->upstream; |
|
8034
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5043 |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5044 if (u->headers_in.x_accel_limit_rate) { |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5045 ngx_log_error(NGX_LOG_WARN, r->connection->log, 0, |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5046 "upstream sent duplicate header line: \"%V: %V\", " |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5047 "previous value: \"%V: %V\", ignored", |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5048 &h->key, &h->value, |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5049 &u->headers_in.x_accel_limit_rate->key, |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5050 &u->headers_in.x_accel_limit_rate->value); |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5051 h->hash = 0; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5052 return NGX_OK; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5053 } |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5054 |
|
4197
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5055 u->headers_in.x_accel_limit_rate = h; |
|
8032
2025aae94739
Upstream: all known headers in u->headers_in are linked lists now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8031
diff
changeset
|
5056 h->next = NULL; |
|
4197
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5057 |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5058 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
|
5059 return NGX_OK; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5060 } |
| 527 | 5061 |
| 5062 n = ngx_atoi(h->value.data, h->value.len); | |
| 5063 | |
| 5064 if (n != NGX_ERROR) { | |
| 5065 r->limit_rate = (size_t) n; | |
|
7504
c19ca381b2e6
Variables support in limit_rate and limit_rate_after (ticket #293).
Ruslan Ermilov <ru@nginx.com>
parents:
7456
diff
changeset
|
5066 r->limit_rate_set = 1; |
| 527 | 5067 } |
| 5068 | |
| 5069 return NGX_OK; | |
| 5070 } | |
| 5071 | |
| 5072 | |
| 5073 static ngx_int_t | |
| 649 | 5074 ngx_http_upstream_process_buffering(ngx_http_request_t *r, ngx_table_elt_t *h, |
| 5075 ngx_uint_t offset) | |
| 5076 { | |
|
4197
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5077 u_char c0, c1, c2; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5078 ngx_http_upstream_t *u; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5079 |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5080 u = r->upstream; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5081 |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5082 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
|
5083 return NGX_OK; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5084 } |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5085 |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5086 if (u->conf->change_buffering) { |
| 649 | 5087 |
| 5088 if (h->value.len == 2) { | |
| 5089 c0 = ngx_tolower(h->value.data[0]); | |
| 5090 c1 = ngx_tolower(h->value.data[1]); | |
| 5091 | |
| 5092 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
|
5093 u->buffering = 0; |
| 649 | 5094 } |
| 5095 | |
| 5096 } else if (h->value.len == 3) { | |
| 5097 c0 = ngx_tolower(h->value.data[0]); | |
| 5098 c1 = ngx_tolower(h->value.data[1]); | |
| 5099 c2 = ngx_tolower(h->value.data[2]); | |
| 5100 | |
| 5101 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
|
5102 u->buffering = 1; |
| 649 | 5103 } |
| 5104 } | |
| 5105 } | |
| 5106 | |
| 5107 return NGX_OK; | |
| 5108 } | |
| 5109 | |
| 5110 | |
| 5111 static ngx_int_t | |
| 657 | 5112 ngx_http_upstream_process_charset(ngx_http_request_t *r, ngx_table_elt_t *h, |
| 5113 ngx_uint_t offset) | |
| 5114 { | |
| 8028 | 5115 ngx_http_upstream_t *u; |
| 5116 | |
| 5117 u = r->upstream; | |
| 5118 | |
| 5119 if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_XA_CHARSET) { | |
|
4197
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5120 return NGX_OK; |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5121 } |
|
cf6a3467b5db
Additional headers for proxy/fastcgi/uwsgi/scgi_ignore_headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4182
diff
changeset
|
5122 |
| 657 | 5123 r->headers_out.override_charset = &h->value; |
| 5124 | |
| 5125 return NGX_OK; | |
| 5126 } | |
| 5127 | |
| 5128 | |
| 5129 static ngx_int_t | |
|
4124
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
5130 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
|
5131 ngx_uint_t offset) |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
5132 { |
|
8034
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5133 ngx_table_elt_t **ph; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5134 ngx_http_upstream_t *u; |
| 8028 | 5135 |
| 5136 u = r->upstream; | |
|
8034
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5137 ph = &u->headers_in.connection; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5138 |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5139 while (*ph) { ph = &(*ph)->next; } |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5140 |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5141 *ph = h; |
|
8032
2025aae94739
Upstream: all known headers in u->headers_in are linked lists now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8031
diff
changeset
|
5142 h->next = NULL; |
|
4124
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
5143 |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
5144 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
|
5145 (u_char *) "close", 5 - 1) |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
5146 != NULL) |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
5147 { |
| 8028 | 5148 u->headers_in.connection_close = 1; |
|
4124
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
5149 } |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
5150 |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
5151 return NGX_OK; |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
5152 } |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
5153 |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
5154 |
|
0c30976f5bfa
Upstream: Connection header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4123
diff
changeset
|
5155 static ngx_int_t |
|
4123
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
5156 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
|
5157 ngx_table_elt_t *h, ngx_uint_t offset) |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
5158 { |
| 8028 | 5159 ngx_http_upstream_t *u; |
| 5160 | |
| 5161 u = r->upstream; | |
|
8033
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5162 |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5163 if (u->headers_in.transfer_encoding) { |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5164 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5165 "upstream sent duplicate header line: \"%V: %V\", " |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5166 "previous value: \"%V: %V\"", |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5167 &h->key, &h->value, |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5168 &u->headers_in.transfer_encoding->key, |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5169 &u->headers_in.transfer_encoding->value); |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5170 return NGX_HTTP_UPSTREAM_INVALID_HEADER; |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5171 } |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5172 |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5173 if (u->headers_in.content_length) { |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5174 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5175 "upstream sent \"Content-Length\" and " |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5176 "\"Transfer-Encoding\" headers at the same time"); |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5177 return NGX_HTTP_UPSTREAM_INVALID_HEADER; |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5178 } |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5179 |
| 8028 | 5180 u->headers_in.transfer_encoding = h; |
|
8032
2025aae94739
Upstream: all known headers in u->headers_in are linked lists now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8031
diff
changeset
|
5181 h->next = NULL; |
|
4123
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
5182 |
|
8033
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5183 if (h->value.len == 7 |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5184 && ngx_strncasecmp(h->value.data, (u_char *) "chunked", 7) == 0) |
|
4123
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
5185 { |
| 8028 | 5186 u->headers_in.chunked = 1; |
|
8033
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5187 |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5188 } else { |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5189 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5190 "upstream sent unknown \"Transfer-Encoding\": \"%V\"", |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5191 &h->value); |
|
2bf7792c262e
Upstream: header handlers can now return parsing errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8032
diff
changeset
|
5192 return NGX_HTTP_UPSTREAM_INVALID_HEADER; |
|
4123
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
5193 } |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
5194 |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
5195 return NGX_OK; |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
5196 } |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
5197 |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
5198 |
|
0ee350b5177c
Upstream: Transfer-Encoding header processing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4120
diff
changeset
|
5199 static ngx_int_t |
|
5877
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5200 ngx_http_upstream_process_vary(ngx_http_request_t *r, |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5201 ngx_table_elt_t *h, ngx_uint_t offset) |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5202 { |
|
8034
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5203 ngx_table_elt_t **ph; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5204 ngx_http_upstream_t *u; |
|
5877
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5205 |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5206 u = r->upstream; |
|
8034
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5207 ph = &u->headers_in.vary; |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5208 |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5209 while (*ph) { ph = &(*ph)->next; } |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5210 |
|
413dbda22f7d
Upstream: duplicate headers ignored or properly linked.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8033
diff
changeset
|
5211 *ph = h; |
|
8032
2025aae94739
Upstream: all known headers in u->headers_in are linked lists now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8031
diff
changeset
|
5212 h->next = NULL; |
|
5877
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5213 |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5214 #if (NGX_HTTP_CACHE) |
|
8040
e0cfab501dd1
Upstream: fixed build without http cache (broken by cd73509f21e2).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8036
diff
changeset
|
5215 { |
|
e0cfab501dd1
Upstream: fixed build without http cache (broken by cd73509f21e2).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8036
diff
changeset
|
5216 u_char *p; |
|
e0cfab501dd1
Upstream: fixed build without http cache (broken by cd73509f21e2).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8036
diff
changeset
|
5217 size_t len; |
|
e0cfab501dd1
Upstream: fixed build without http cache (broken by cd73509f21e2).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8036
diff
changeset
|
5218 ngx_str_t vary; |
|
5877
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5219 |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5220 if (u->conf->ignore_headers & NGX_HTTP_UPSTREAM_IGN_VARY) { |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5221 return NGX_OK; |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5222 } |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5223 |
|
8035
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5224 if (r->cache == NULL || !u->cacheable) { |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5225 return NGX_OK; |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5226 } |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5227 |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5228 if (h->value.len == 1 && h->value.data[0] == '*') { |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5229 u->cacheable = 0; |
|
5878
2c89956b6a76
Cache: hash of Vary headers now stored in cache.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5877
diff
changeset
|
5230 return NGX_OK; |
|
2c89956b6a76
Cache: hash of Vary headers now stored in cache.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5877
diff
changeset
|
5231 } |
|
2c89956b6a76
Cache: hash of Vary headers now stored in cache.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5877
diff
changeset
|
5232 |
|
8035
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5233 if (u->headers_in.vary->next) { |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5234 |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5235 len = 0; |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5236 |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5237 for (h = u->headers_in.vary; h; h = h->next) { |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5238 len += h->value.len + 2; |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5239 } |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5240 |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5241 len -= 2; |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5242 |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5243 p = ngx_pnalloc(r->pool, len); |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5244 if (p == NULL) { |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5245 return NGX_ERROR; |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5246 } |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5247 |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5248 vary.len = len; |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5249 vary.data = p; |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5250 |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5251 for (h = u->headers_in.vary; h; h = h->next) { |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5252 p = ngx_copy(p, h->value.data, h->value.len); |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5253 |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5254 if (h->next == NULL) { |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5255 break; |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5256 } |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5257 |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5258 *p++ = ','; *p++ = ' '; |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5259 } |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5260 |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5261 } else { |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5262 vary = h->value; |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5263 } |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5264 |
|
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5265 if (vary.len > NGX_HTTP_CACHE_VARY_LEN) { |
|
5878
2c89956b6a76
Cache: hash of Vary headers now stored in cache.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5877
diff
changeset
|
5266 u->cacheable = 0; |
|
2c89956b6a76
Cache: hash of Vary headers now stored in cache.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5877
diff
changeset
|
5267 } |
|
2c89956b6a76
Cache: hash of Vary headers now stored in cache.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5877
diff
changeset
|
5268 |
|
8035
cd73509f21e2
Upstream: handling of multiple Vary headers (ticket #1423).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8034
diff
changeset
|
5269 r->cache->vary = vary; |
|
8040
e0cfab501dd1
Upstream: fixed build without http cache (broken by cd73509f21e2).
Maxim Dounin <mdounin@mdounin.ru>
parents:
8036
diff
changeset
|
5270 } |
|
5877
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5271 #endif |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5272 |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5273 return NGX_OK; |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5274 } |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5275 |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5276 |
|
60fde1bc7236
Cache: disable caching of responses with Vary (ticket #118).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5874
diff
changeset
|
5277 static ngx_int_t |
| 509 | 5278 ngx_http_upstream_copy_header_line(ngx_http_request_t *r, ngx_table_elt_t *h, |
| 5279 ngx_uint_t offset) | |
| 5280 { | |
| 573 | 5281 ngx_table_elt_t *ho, **ph; |
| 509 | 5282 |
| 5283 ho = ngx_list_push(&r->headers_out.headers); | |
| 5284 if (ho == NULL) { | |
| 5285 return NGX_ERROR; | |
| 5286 } | |
| 5287 | |
| 5288 *ho = *h; | |
| 5289 | |
| 573 | 5290 if (offset) { |
| 5291 ph = (ngx_table_elt_t **) ((char *) &r->headers_out + offset); | |
| 5292 *ph = ho; | |
|
8031
d26db4f82d7d
All known output headers can be linked lists now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8030
diff
changeset
|
5293 ho->next = NULL; |
| 573 | 5294 } |
| 5295 | |
| 509 | 5296 return NGX_OK; |
| 5297 } | |
| 5298 | |
| 5299 | |
| 5300 static ngx_int_t | |
| 5301 ngx_http_upstream_copy_multi_header_lines(ngx_http_request_t *r, | |
| 5302 ngx_table_elt_t *h, ngx_uint_t offset) | |
| 5303 { | |
| 5304 ngx_table_elt_t *ho, **ph; | |
| 5305 | |
| 5306 ho = ngx_list_push(&r->headers_out.headers); | |
| 5307 if (ho == NULL) { | |
| 5308 return NGX_ERROR; | |
| 5309 } | |
| 5310 | |
| 5311 *ho = *h; | |
|
6986
0cdee26605f3
Cleaned up r->headers_out.headers allocation error handling.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6966
diff
changeset
|
5312 |
|
8024
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8023
diff
changeset
|
5313 ph = (ngx_table_elt_t **) ((char *) &r->headers_out + offset); |
|
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8023
diff
changeset
|
5314 |
|
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8023
diff
changeset
|
5315 while (*ph) { ph = &(*ph)->next; } |
|
6986
0cdee26605f3
Cleaned up r->headers_out.headers allocation error handling.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6966
diff
changeset
|
5316 |
| 509 | 5317 *ph = ho; |
|
8024
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8023
diff
changeset
|
5318 ho->next = NULL; |
| 509 | 5319 |
| 5320 return NGX_OK; | |
| 5321 } | |
| 5322 | |
| 5323 | |
| 5324 static ngx_int_t | |
| 5325 ngx_http_upstream_copy_content_type(ngx_http_request_t *r, ngx_table_elt_t *h, | |
| 5326 ngx_uint_t offset) | |
| 5327 { | |
| 657 | 5328 u_char *p, *last; |
| 5329 | |
| 5330 r->headers_out.content_type_len = h->value.len; | |
| 509 | 5331 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
|
5332 r->headers_out.content_type_lowcase = NULL; |
| 509 | 5333 |
| 657 | 5334 for (p = h->value.data; *p; p++) { |
| 5335 | |
| 5336 if (*p != ';') { | |
| 5337 continue; | |
| 5338 } | |
| 5339 | |
| 5340 last = p; | |
| 5341 | |
| 5342 while (*++p == ' ') { /* void */ } | |
| 5343 | |
| 1968 | 5344 if (*p == '\0') { |
| 5345 return NGX_OK; | |
| 5346 } | |
| 5347 | |
|
1107
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
1098
diff
changeset
|
5348 if (ngx_strncasecmp(p, (u_char *) "charset=", 8) != 0) { |
| 657 | 5349 continue; |
| 5350 } | |
| 5351 | |
| 5352 p += 8; | |
| 5353 | |
| 5354 r->headers_out.content_type_len = last - h->value.data; | |
| 5355 | |
| 2244 | 5356 if (*p == '"') { |
| 5357 p++; | |
| 5358 } | |
| 5359 | |
| 5360 last = h->value.data + h->value.len; | |
| 5361 | |
| 5362 if (*(last - 1) == '"') { | |
| 5363 last--; | |
| 5364 } | |
| 5365 | |
| 5366 r->headers_out.charset.len = last - p; | |
| 657 | 5367 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
|
5368 |
|
c6c42497106c
fix segfault if upstream sends trailing ";" in "charset="
Igor Sysoev <igor@sysoev.ru>
parents:
1109
diff
changeset
|
5369 return NGX_OK; |
| 657 | 5370 } |
| 5371 | |
| 509 | 5372 return NGX_OK; |
| 5373 } | |
| 5374 | |
| 5375 | |
| 5376 static ngx_int_t | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5377 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
|
5378 ngx_uint_t offset) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5379 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5380 ngx_table_elt_t *ho; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5381 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5382 ho = ngx_list_push(&r->headers_out.headers); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5383 if (ho == NULL) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5384 return NGX_ERROR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5385 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5386 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5387 *ho = *h; |
|
8031
d26db4f82d7d
All known output headers can be linked lists now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8030
diff
changeset
|
5388 ho->next = NULL; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5389 |
|
3004
4121acaf7a04
fix handling "Last-Modified" and "Accept-Ranges" for upstream responses
Igor Sysoev <igor@sysoev.ru>
parents:
3003
diff
changeset
|
5390 r->headers_out.last_modified = ho; |
|
7093
acc2cddc7b45
Upstream: unconditional parsing of last_modified_time.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7077
diff
changeset
|
5391 r->headers_out.last_modified_time = |
|
5732
d0ce06cb9be1
Upstream: fixed cache revalidation with SSI.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5731
diff
changeset
|
5392 r->upstream->headers_in.last_modified_time; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5393 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5394 return NGX_OK; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5395 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5396 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5397 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5398 static ngx_int_t |
| 509 | 5399 ngx_http_upstream_rewrite_location(ngx_http_request_t *r, ngx_table_elt_t *h, |
| 5400 ngx_uint_t offset) | |
| 5401 { | |
| 5402 ngx_int_t rc; | |
| 5403 ngx_table_elt_t *ho; | |
| 5404 | |
| 5405 ho = ngx_list_push(&r->headers_out.headers); | |
| 5406 if (ho == NULL) { | |
| 5407 return NGX_ERROR; | |
| 5408 } | |
| 5409 | |
| 5410 *ho = *h; | |
|
8031
d26db4f82d7d
All known output headers can be linked lists now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8030
diff
changeset
|
5411 ho->next = NULL; |
| 509 | 5412 |
| 5413 if (r->upstream->rewrite_redirect) { | |
| 5414 rc = r->upstream->rewrite_redirect(r, ho, 0); | |
| 5415 | |
| 529 | 5416 if (rc == NGX_DECLINED) { |
| 5417 return NGX_OK; | |
| 5418 } | |
| 5419 | |
| 509 | 5420 if (rc == NGX_OK) { |
| 5421 r->headers_out.location = ho; | |
| 5422 | |
| 5423 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 5424 "rewritten location: \"%V\"", &ho->value); | |
| 5425 } | |
| 5426 | |
| 5427 return rc; | |
| 5428 } | |
| 5429 | |
|
1653
ea681a6a0c61
set r->headers_out.location for non-local redirects
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
5430 if (ho->value.data[0] != '/') { |
|
ea681a6a0c61
set r->headers_out.location for non-local redirects
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
5431 r->headers_out.location = ho; |
|
ea681a6a0c61
set r->headers_out.location for non-local redirects
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
5432 } |
|
ea681a6a0c61
set r->headers_out.location for non-local redirects
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
5433 |
| 509 | 5434 /* |
|
6853
c85dfd99a2dd
Fixed missing "Location" field with some relative redirects.
Ruslan Ermilov <ru@nginx.com>
parents:
6799
diff
changeset
|
5435 * we do not set r->headers_out.location here to avoid handling |
|
c85dfd99a2dd
Fixed missing "Location" field with some relative redirects.
Ruslan Ermilov <ru@nginx.com>
parents:
6799
diff
changeset
|
5436 * relative redirects in ngx_http_header_filter() |
| 509 | 5437 */ |
| 5438 | |
| 5439 return NGX_OK; | |
| 5440 } | |
| 5441 | |
| 5442 | |
| 5443 static ngx_int_t | |
| 5444 ngx_http_upstream_rewrite_refresh(ngx_http_request_t *r, ngx_table_elt_t *h, | |
| 5445 ngx_uint_t offset) | |
| 5446 { | |
| 5447 u_char *p; | |
| 5448 ngx_int_t rc; | |
| 5449 ngx_table_elt_t *ho; | |
| 5450 | |
| 5451 ho = ngx_list_push(&r->headers_out.headers); | |
| 5452 if (ho == NULL) { | |
| 5453 return NGX_ERROR; | |
| 5454 } | |
| 5455 | |
| 5456 *ho = *h; | |
|
8031
d26db4f82d7d
All known output headers can be linked lists now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8030
diff
changeset
|
5457 ho->next = NULL; |
| 509 | 5458 |
| 5459 if (r->upstream->rewrite_redirect) { | |
| 5460 | |
| 1549 | 5461 p = ngx_strcasestrn(ho->value.data, "url=", 4 - 1); |
| 509 | 5462 |
| 5463 if (p) { | |
| 5464 rc = r->upstream->rewrite_redirect(r, ho, p + 4 - ho->value.data); | |
| 5465 | |
| 5466 } else { | |
| 5467 return NGX_OK; | |
| 5468 } | |
| 5469 | |
| 529 | 5470 if (rc == NGX_DECLINED) { |
| 5471 return NGX_OK; | |
| 5472 } | |
| 5473 | |
| 509 | 5474 if (rc == NGX_OK) { |
| 1654 | 5475 r->headers_out.refresh = ho; |
| 5476 | |
| 509 | 5477 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 5478 "rewritten refresh: \"%V\"", &ho->value); | |
| 5479 } | |
| 5480 | |
| 5481 return rc; | |
| 5482 } | |
| 5483 | |
| 1654 | 5484 r->headers_out.refresh = ho; |
| 5485 | |
| 509 | 5486 return NGX_OK; |
| 5487 } | |
| 5488 | |
| 5489 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5490 static ngx_int_t |
|
4464
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5491 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
|
5492 ngx_uint_t offset) |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5493 { |
|
4650
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
5494 ngx_int_t rc; |
|
4464
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5495 ngx_table_elt_t *ho; |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5496 |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5497 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
|
5498 if (ho == NULL) { |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5499 return NGX_ERROR; |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5500 } |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5501 |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5502 *ho = *h; |
|
8031
d26db4f82d7d
All known output headers can be linked lists now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8030
diff
changeset
|
5503 ho->next = NULL; |
|
4464
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5504 |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5505 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
|
5506 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
|
5507 |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
5508 if (rc == NGX_DECLINED) { |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
5509 return NGX_OK; |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
5510 } |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
5511 |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
5512 #if (NGX_DEBUG) |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
5513 if (rc == NGX_OK) { |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
5514 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
|
5515 "rewritten cookie: \"%V\"", &ho->value); |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
5516 } |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
5517 #endif |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
5518 |
|
b38fea6f9a15
Fixed returned value handling from the cookie rewrite handler.
Valentin Bartenev <vbart@nginx.com>
parents:
4572
diff
changeset
|
5519 return rc; |
|
4464
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5520 } |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5521 |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5522 return NGX_OK; |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5523 } |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5524 |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5525 |
|
7bf3b68239a3
Upstream: added callback hook for the "Set-Cookie" header.
Valentin Bartenev <vbart@nginx.com>
parents:
4460
diff
changeset
|
5526 static ngx_int_t |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5527 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
|
5528 ngx_table_elt_t *h, ngx_uint_t offset) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5529 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5530 ngx_table_elt_t *ho; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5531 |
|
5874
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5869
diff
changeset
|
5532 if (r->upstream->conf->force_ranges) { |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5869
diff
changeset
|
5533 return NGX_OK; |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5869
diff
changeset
|
5534 } |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5869
diff
changeset
|
5535 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5536 #if (NGX_HTTP_CACHE) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5537 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5538 if (r->cached) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5539 r->allow_ranges = 1; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5540 return NGX_OK; |
|
5621
345e4fd4bb64
Range filter: single_range flag in request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5581
diff
changeset
|
5541 } |
|
345e4fd4bb64
Range filter: single_range flag in request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5581
diff
changeset
|
5542 |
|
345e4fd4bb64
Range filter: single_range flag in request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5581
diff
changeset
|
5543 if (r->upstream->cacheable) { |
|
345e4fd4bb64
Range filter: single_range flag in request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5581
diff
changeset
|
5544 r->allow_ranges = 1; |
|
345e4fd4bb64
Range filter: single_range flag in request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5581
diff
changeset
|
5545 r->single_range = 1; |
|
345e4fd4bb64
Range filter: single_range flag in request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5581
diff
changeset
|
5546 return NGX_OK; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5547 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5548 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5549 #endif |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5550 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5551 ho = ngx_list_push(&r->headers_out.headers); |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5552 if (ho == NULL) { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5553 return NGX_ERROR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5554 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5555 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5556 *ho = *h; |
|
8031
d26db4f82d7d
All known output headers can be linked lists now.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8030
diff
changeset
|
5557 ho->next = NULL; |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5558 |
|
3004
4121acaf7a04
fix handling "Last-Modified" and "Accept-Ranges" for upstream responses
Igor Sysoev <igor@sysoev.ru>
parents:
3003
diff
changeset
|
5559 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
|
5560 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5561 return NGX_OK; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5562 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5563 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
5564 |
| 487 | 5565 static ngx_int_t |
| 573 | 5566 ngx_http_upstream_add_variables(ngx_conf_t *cf) |
| 479 | 5567 { |
| 880 | 5568 ngx_http_variable_t *var, *v; |
| 479 | 5569 |
| 573 | 5570 for (v = ngx_http_upstream_vars; v->name.len; v++) { |
| 5571 var = ngx_http_add_variable(cf, &v->name, v->flags); | |
| 5572 if (var == NULL) { | |
| 5573 return NGX_ERROR; | |
| 5574 } | |
| 5575 | |
| 637 | 5576 var->get_handler = v->get_handler; |
| 573 | 5577 var->data = v->data; |
| 5578 } | |
| 5579 | |
| 479 | 5580 return NGX_OK; |
| 5581 } | |
| 509 | 5582 |
| 5583 | |
| 573 | 5584 static ngx_int_t |
| 1181 | 5585 ngx_http_upstream_addr_variable(ngx_http_request_t *r, |
| 5586 ngx_http_variable_value_t *v, uintptr_t data) | |
| 5587 { | |
| 5588 u_char *p; | |
| 5589 size_t len; | |
| 5590 ngx_uint_t i; | |
| 5591 ngx_http_upstream_state_t *state; | |
| 5592 | |
| 5593 v->valid = 1; | |
| 1565 | 5594 v->no_cacheable = 0; |
| 1181 | 5595 v->not_found = 0; |
| 5596 | |
| 5597 if (r->upstream_states == NULL || r->upstream_states->nelts == 0) { | |
| 5598 v->not_found = 1; | |
| 5599 return NGX_OK; | |
| 5600 } | |
| 5601 | |
| 5602 len = 0; | |
| 5603 state = r->upstream_states->elts; | |
| 5604 | |
| 5605 for (i = 0; i < r->upstream_states->nelts; i++) { | |
| 5606 if (state[i].peer) { | |
| 5607 len += state[i].peer->len + 2; | |
| 5608 | |
| 5609 } else { | |
| 5610 len += 3; | |
| 5611 } | |
| 5612 } | |
| 5613 | |
| 2049 | 5614 p = ngx_pnalloc(r->pool, len); |
| 1181 | 5615 if (p == NULL) { |
| 5616 return NGX_ERROR; | |
| 5617 } | |
| 5618 | |
| 5619 v->data = p; | |
| 5620 | |
| 5621 i = 0; | |
| 5622 | |
| 5623 for ( ;; ) { | |
| 5624 if (state[i].peer) { | |
| 5625 p = ngx_cpymem(p, state[i].peer->data, state[i].peer->len); | |
| 5626 } | |
| 5627 | |
| 5628 if (++i == r->upstream_states->nelts) { | |
| 5629 break; | |
| 5630 } | |
| 5631 | |
| 5632 if (state[i].peer) { | |
| 5633 *p++ = ','; | |
| 5634 *p++ = ' '; | |
| 5635 | |
| 5636 } else { | |
| 5637 *p++ = ' '; | |
| 5638 *p++ = ':'; | |
| 5639 *p++ = ' '; | |
| 5640 | |
| 5641 if (++i == r->upstream_states->nelts) { | |
| 5642 break; | |
| 5643 } | |
| 5644 | |
| 5645 continue; | |
| 5646 } | |
| 5647 } | |
| 5648 | |
| 5649 v->len = p - v->data; | |
| 5650 | |
| 5651 return NGX_OK; | |
| 5652 } | |
| 5653 | |
| 5654 | |
| 5655 static ngx_int_t | |
| 573 | 5656 ngx_http_upstream_status_variable(ngx_http_request_t *r, |
| 5657 ngx_http_variable_value_t *v, uintptr_t data) | |
| 5658 { | |
| 5659 u_char *p; | |
| 5660 size_t len; | |
| 5661 ngx_uint_t i; | |
| 5662 ngx_http_upstream_state_t *state; | |
| 5663 | |
| 5664 v->valid = 1; | |
| 1565 | 5665 v->no_cacheable = 0; |
| 573 | 5666 v->not_found = 0; |
| 5667 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5668 if (r->upstream_states == NULL || r->upstream_states->nelts == 0) { |
| 573 | 5669 v->not_found = 1; |
| 5670 return NGX_OK; | |
| 5671 } | |
| 5672 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5673 len = r->upstream_states->nelts * (3 + 2); |
| 573 | 5674 |
| 2049 | 5675 p = ngx_pnalloc(r->pool, len); |
| 573 | 5676 if (p == NULL) { |
| 5677 return NGX_ERROR; | |
| 5678 } | |
| 5679 | |
| 5680 v->data = p; | |
| 5681 | |
| 5682 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
|
5683 state = r->upstream_states->elts; |
| 573 | 5684 |
| 5685 for ( ;; ) { | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5686 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
|
5687 p = ngx_sprintf(p, "%ui", state[i].status); |
| 573 | 5688 |
| 5689 } else { | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5690 *p++ = '-'; |
| 573 | 5691 } |
| 5692 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5693 if (++i == r->upstream_states->nelts) { |
| 573 | 5694 break; |
| 5695 } | |
| 5696 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5697 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
|
5698 *p++ = ','; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5699 *p++ = ' '; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5700 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5701 } else { |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5702 *p++ = ' '; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5703 *p++ = ':'; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5704 *p++ = ' '; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5705 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5706 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
|
5707 break; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5708 } |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5709 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5710 continue; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5711 } |
| 573 | 5712 } |
| 5713 | |
| 5714 v->len = p - v->data; | |
| 5715 | |
| 5716 return NGX_OK; | |
| 5717 } | |
| 5718 | |
| 5719 | |
| 5720 static ngx_int_t | |
| 5721 ngx_http_upstream_response_time_variable(ngx_http_request_t *r, | |
| 5722 ngx_http_variable_value_t *v, uintptr_t data) | |
| 5723 { | |
| 5724 u_char *p; | |
| 5725 size_t len; | |
| 5726 ngx_uint_t i; | |
|
889
a9a7e4b1a72b
the previous fix does not actually fix overflow
Igor Sysoev <igor@sysoev.ru>
parents:
888
diff
changeset
|
5727 ngx_msec_int_t ms; |
| 573 | 5728 ngx_http_upstream_state_t *state; |
| 5729 | |
| 5730 v->valid = 1; | |
| 1565 | 5731 v->no_cacheable = 0; |
| 573 | 5732 v->not_found = 0; |
| 5733 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5734 if (r->upstream_states == NULL || r->upstream_states->nelts == 0) { |
| 573 | 5735 v->not_found = 1; |
| 5736 return NGX_OK; | |
| 5737 } | |
| 5738 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5739 len = r->upstream_states->nelts * (NGX_TIME_T_LEN + 4 + 2); |
| 573 | 5740 |
| 2049 | 5741 p = ngx_pnalloc(r->pool, len); |
| 573 | 5742 if (p == NULL) { |
| 5743 return NGX_ERROR; | |
| 5744 } | |
| 5745 | |
| 5746 v->data = p; | |
| 5747 | |
| 5748 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
|
5749 state = r->upstream_states->elts; |
| 573 | 5750 |
| 5751 for ( ;; ) { | |
|
7397
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
5752 |
|
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
5753 if (data == 1) { |
|
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
5754 ms = state[i].header_time; |
|
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
5755 |
|
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
5756 } else if (data == 2) { |
|
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
5757 ms = state[i].connect_time; |
|
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
5758 |
|
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
5759 } else { |
|
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
5760 ms = state[i].response_time; |
|
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
5761 } |
|
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
5762 |
|
860d3907da1c
Upstream: revised upstream response time variables.
Vladimir Homutov <vl@nginx.com>
parents:
7371
diff
changeset
|
5763 if (ms != -1) { |
| 3515 | 5764 ms = ngx_max(ms, 0); |
|
5368
cd46297325bd
Upstream: fixed $upstream_response_time format specifiers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5353
diff
changeset
|
5765 p = ngx_sprintf(p, "%T.%03M", (time_t) 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
|
5766 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5767 } else { |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5768 *p++ = '-'; |
| 573 | 5769 } |
| 5770 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5771 if (++i == r->upstream_states->nelts) { |
| 573 | 5772 break; |
| 5773 } | |
| 5774 | |
|
1168
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5775 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
|
5776 *p++ = ','; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5777 *p++ = ' '; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5778 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5779 } else { |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5780 *p++ = ' '; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5781 *p++ = ':'; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5782 *p++ = ' '; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5783 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5784 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
|
5785 break; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5786 } |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5787 |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5788 continue; |
|
4d0d12446c3b
store the upstream states before X-Accel-Redirect to a next upstream
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
5789 } |
| 573 | 5790 } |
| 5791 | |
| 5792 v->len = p - v->data; | |
| 5793 | |
| 5794 return NGX_OK; | |
| 5795 } | |
| 5796 | |
| 5797 | |
| 2402 | 5798 static ngx_int_t |
| 5799 ngx_http_upstream_response_length_variable(ngx_http_request_t *r, | |
| 5800 ngx_http_variable_value_t *v, uintptr_t data) | |
| 5801 { | |
| 5802 u_char *p; | |
| 5803 size_t len; | |
| 5804 ngx_uint_t i; | |
| 5805 ngx_http_upstream_state_t *state; | |
| 5806 | |
| 5807 v->valid = 1; | |
| 5808 v->no_cacheable = 0; | |
| 5809 v->not_found = 0; | |
| 5810 | |
| 5811 if (r->upstream_states == NULL || r->upstream_states->nelts == 0) { | |
| 5812 v->not_found = 1; | |
| 5813 return NGX_OK; | |
| 5814 } | |
| 5815 | |
| 5816 len = r->upstream_states->nelts * (NGX_OFF_T_LEN + 2); | |
| 5817 | |
| 5818 p = ngx_pnalloc(r->pool, len); | |
| 5819 if (p == NULL) { | |
| 5820 return NGX_ERROR; | |
| 5821 } | |
| 5822 | |
| 5823 v->data = p; | |
| 5824 | |
| 5825 i = 0; | |
| 5826 state = r->upstream_states->elts; | |
| 5827 | |
| 5828 for ( ;; ) { | |
|
6654
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
5829 |
|
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
5830 if (data == 1) { |
|
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
5831 p = ngx_sprintf(p, "%O", state[i].bytes_received); |
|
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
5832 |
|
7429
e573d74299a0
Upstream: implemented $upstream_bytes_sent.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
5833 } else if (data == 2) { |
|
e573d74299a0
Upstream: implemented $upstream_bytes_sent.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
5834 p = ngx_sprintf(p, "%O", state[i].bytes_sent); |
|
e573d74299a0
Upstream: implemented $upstream_bytes_sent.
Ruslan Ermilov <ru@nginx.com>
parents:
7397
diff
changeset
|
5835 |
|
6654
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
5836 } else { |
|
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
5837 p = ngx_sprintf(p, "%O", state[i].response_length); |
|
c131f20c9562
Upstream: the $upstream_bytes_received variable.
Vladimir Homutov <vl@nginx.com>
parents:
6594
diff
changeset
|
5838 } |
| 2402 | 5839 |
| 5840 if (++i == r->upstream_states->nelts) { | |
| 5841 break; | |
| 5842 } | |
| 5843 | |
| 5844 if (state[i].peer) { | |
| 5845 *p++ = ','; | |
| 5846 *p++ = ' '; | |
| 5847 | |
| 5848 } else { | |
| 5849 *p++ = ' '; | |
| 5850 *p++ = ':'; | |
| 5851 *p++ = ' '; | |
| 5852 | |
| 5853 if (++i == r->upstream_states->nelts) { | |
| 5854 break; | |
| 5855 } | |
| 5856 | |
| 5857 continue; | |
| 5858 } | |
| 5859 } | |
| 5860 | |
| 5861 v->len = p - v->data; | |
| 5862 | |
| 5863 return NGX_OK; | |
| 5864 } | |
| 5865 | |
| 5866 | |
|
6899
d2b2ff157da5
Variables: generic prefix variables.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6876
diff
changeset
|
5867 static ngx_int_t |
| 1162 | 5868 ngx_http_upstream_header_variable(ngx_http_request_t *r, |
| 5869 ngx_http_variable_value_t *v, uintptr_t data) | |
| 5870 { | |
| 5871 if (r->upstream == NULL) { | |
| 5872 v->not_found = 1; | |
| 5873 return NGX_OK; | |
| 5874 } | |
| 5875 | |
|
8023
08b3ea81ff5f
Combining unknown headers during variables lookup (ticket #1316).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7975
diff
changeset
|
5876 return ngx_http_variable_unknown_header(r, v, (ngx_str_t *) data, |
| 1162 | 5877 &r->upstream->headers_in.headers.part, |
| 5878 sizeof("upstream_http_") - 1); | |
| 5879 } | |
| 5880 | |
| 5881 | |
|
6899
d2b2ff157da5
Variables: generic prefix variables.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6876
diff
changeset
|
5882 static ngx_int_t |
|
7230
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
5883 ngx_http_upstream_trailer_variable(ngx_http_request_t *r, |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
5884 ngx_http_variable_value_t *v, uintptr_t data) |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
5885 { |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
5886 if (r->upstream == NULL) { |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
5887 v->not_found = 1; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
5888 return NGX_OK; |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
5889 } |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
5890 |
|
8023
08b3ea81ff5f
Combining unknown headers during variables lookup (ticket #1316).
Maxim Dounin <mdounin@mdounin.ru>
parents:
7975
diff
changeset
|
5891 return ngx_http_variable_unknown_header(r, v, (ngx_str_t *) data, |
|
7230
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
5892 &r->upstream->headers_in.trailers.part, |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
5893 sizeof("upstream_trailer_") - 1); |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
5894 } |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
5895 |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
5896 |
|
098bbd076a2d
Upstream: trailers support, u->conf->pass_trailers flag.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7220
diff
changeset
|
5897 static ngx_int_t |
|
5677
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5898 ngx_http_upstream_cookie_variable(ngx_http_request_t *r, |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5899 ngx_http_variable_value_t *v, uintptr_t data) |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5900 { |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5901 ngx_str_t *name = (ngx_str_t *) data; |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5902 |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5903 ngx_str_t cookie, s; |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5904 |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5905 if (r->upstream == NULL) { |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5906 v->not_found = 1; |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5907 return NGX_OK; |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5908 } |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5909 |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5910 s.len = name->len - (sizeof("upstream_cookie_") - 1); |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5911 s.data = name->data + sizeof("upstream_cookie_") - 1; |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5912 |
|
8024
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8023
diff
changeset
|
5913 if (ngx_http_parse_set_cookie_lines(r, r->upstream->headers_in.set_cookie, |
|
5677
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5914 &s, &cookie) |
|
8024
ef6a3a99a81a
Reworked multi headers to use linked lists.
Maxim Dounin <mdounin@mdounin.ru>
parents:
8023
diff
changeset
|
5915 == NULL) |
|
5677
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5916 { |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5917 v->not_found = 1; |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5918 return NGX_OK; |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5919 } |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5920 |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5921 v->len = cookie.len; |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5922 v->valid = 1; |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5923 v->no_cacheable = 0; |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5924 v->not_found = 0; |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5925 v->data = cookie.data; |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5926 |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5927 return NGX_OK; |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5928 } |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5929 |
|
3a48775f1535
Upstream: added the "$upstream_cookie_<name>" variables.
Vladimir Homutov <vl@nginx.com>
parents:
5667
diff
changeset
|
5930 |
| 2952 | 5931 #if (NGX_HTTP_CACHE) |
| 5932 | |
|
6923
fbdaad9b0e7b
Added missing "static" specifiers found by gcc -Wtraditional.
Ruslan Ermilov <ru@nginx.com>
parents:
6922
diff
changeset
|
5933 static ngx_int_t |
| 2952 | 5934 ngx_http_upstream_cache_status(ngx_http_request_t *r, |
| 5935 ngx_http_variable_value_t *v, uintptr_t data) | |
| 5936 { | |
| 5937 ngx_uint_t n; | |
| 5938 | |
| 5939 if (r->upstream == NULL || r->upstream->cache_status == 0) { | |
| 5940 v->not_found = 1; | |
| 5941 return NGX_OK; | |
| 5942 } | |
| 5943 | |
| 5944 n = r->upstream->cache_status - 1; | |
| 5945 | |
| 5946 v->valid = 1; | |
| 5947 v->no_cacheable = 0; | |
| 5948 v->not_found = 0; | |
| 5949 v->len = ngx_http_cache_status[n].len; | |
| 5950 v->data = ngx_http_cache_status[n].data; | |
| 5951 | |
| 5952 return NGX_OK; | |
| 5953 } | |
| 5954 | |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5955 |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5956 static ngx_int_t |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5957 ngx_http_upstream_cache_last_modified(ngx_http_request_t *r, |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5958 ngx_http_variable_value_t *v, uintptr_t data) |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5959 { |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5960 u_char *p; |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5961 |
|
5453
b7b8e2fa7ebd
Fixed null pointer dereference with $upstream_cache_last_modified.
Ruslan Ermilov <ru@nginx.com>
parents:
5441
diff
changeset
|
5962 if (r->upstream == NULL |
|
b7b8e2fa7ebd
Fixed null pointer dereference with $upstream_cache_last_modified.
Ruslan Ermilov <ru@nginx.com>
parents:
5441
diff
changeset
|
5963 || !r->upstream->conf->cache_revalidate |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5964 || r->upstream->cache_status != NGX_HTTP_CACHE_EXPIRED |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5965 || r->cache->last_modified == -1) |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5966 { |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5967 v->not_found = 1; |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5968 return NGX_OK; |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5969 } |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5970 |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5971 p = ngx_pnalloc(r->pool, sizeof("Mon, 28 Sep 1970 06:00:00 GMT") - 1); |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5972 if (p == NULL) { |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5973 return NGX_ERROR; |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5974 } |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5975 |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5976 v->len = ngx_http_time(p, r->cache->last_modified) - p; |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5977 v->valid = 1; |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5978 v->no_cacheable = 0; |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5979 v->not_found = 0; |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5980 v->data = p; |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5981 |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5982 return NGX_OK; |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5983 } |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5410
diff
changeset
|
5984 |
|
5738
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
5985 |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
5986 static ngx_int_t |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
5987 ngx_http_upstream_cache_etag(ngx_http_request_t *r, |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
5988 ngx_http_variable_value_t *v, uintptr_t data) |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
5989 { |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
5990 if (r->upstream == NULL |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
5991 || !r->upstream->conf->cache_revalidate |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
5992 || r->upstream->cache_status != NGX_HTTP_CACHE_EXPIRED |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
5993 || r->cache->etag.len == 0) |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
5994 { |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
5995 v->not_found = 1; |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
5996 return NGX_OK; |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
5997 } |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
5998 |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
5999 v->valid = 1; |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
6000 v->no_cacheable = 0; |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
6001 v->not_found = 0; |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
6002 v->len = r->cache->etag.len; |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
6003 v->data = r->cache->etag.data; |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
6004 |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
6005 return NGX_OK; |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
6006 } |
|
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5737
diff
changeset
|
6007 |
| 2952 | 6008 #endif |
| 6009 | |
| 6010 | |
| 651 | 6011 static char * |
| 6012 ngx_http_upstream(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy) | |
| 6013 { | |
| 884 | 6014 char *rv; |
| 6015 void *mconf; | |
| 6016 ngx_str_t *value; | |
| 6017 ngx_url_t u; | |
| 6018 ngx_uint_t m; | |
| 6019 ngx_conf_t pcf; | |
| 6020 ngx_http_module_t *module; | |
| 6021 ngx_http_conf_ctx_t *ctx, *http_ctx; | |
| 6022 ngx_http_upstream_srv_conf_t *uscf; | |
| 6023 | |
| 6024 ngx_memzero(&u, sizeof(ngx_url_t)); | |
| 6025 | |
| 6026 value = cf->args->elts; | |
| 6027 u.host = value[1]; | |
| 6028 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
|
6029 u.no_port = 1; |
| 884 | 6030 |
| 6031 uscf = ngx_http_upstream_add(cf, &u, NGX_HTTP_UPSTREAM_CREATE | |
| 6032 |NGX_HTTP_UPSTREAM_WEIGHT | |
| 6705 | 6033 |NGX_HTTP_UPSTREAM_MAX_CONNS |
| 884 | 6034 |NGX_HTTP_UPSTREAM_MAX_FAILS |
| 6035 |NGX_HTTP_UPSTREAM_FAIL_TIMEOUT | |
| 6036 |NGX_HTTP_UPSTREAM_DOWN | |
| 6037 |NGX_HTTP_UPSTREAM_BACKUP); | |
| 6038 if (uscf == NULL) { | |
| 6039 return NGX_CONF_ERROR; | |
| 6040 } | |
| 6041 | |
| 651 | 6042 |
| 6043 ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_conf_ctx_t)); | |
| 6044 if (ctx == NULL) { | |
| 6045 return NGX_CONF_ERROR; | |
| 6046 } | |
| 6047 | |
| 884 | 6048 http_ctx = cf->ctx; |
| 6049 ctx->main_conf = http_ctx->main_conf; | |
| 651 | 6050 |
| 6051 /* the upstream{}'s srv_conf */ | |
| 6052 | |
| 6053 ctx->srv_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_http_max_module); | |
| 6054 if (ctx->srv_conf == NULL) { | |
| 6055 return NGX_CONF_ERROR; | |
| 6056 } | |
| 6057 | |
| 6058 ctx->srv_conf[ngx_http_upstream_module.ctx_index] = uscf; | |
| 6059 | |
| 884 | 6060 uscf->srv_conf = ctx->srv_conf; |
| 6061 | |
| 651 | 6062 |
| 6063 /* the upstream{}'s loc_conf */ | |
| 6064 | |
| 6065 ctx->loc_conf = ngx_pcalloc(cf->pool, sizeof(void *) * ngx_http_max_module); | |
| 6066 if (ctx->loc_conf == NULL) { | |
| 6067 return NGX_CONF_ERROR; | |
| 6068 } | |
| 6069 | |
|
6379
cf5e822cf470
Dynamic modules: changed ngx_modules to cycle->modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6334
diff
changeset
|
6070 for (m = 0; cf->cycle->modules[m]; m++) { |
|
cf5e822cf470
Dynamic modules: changed ngx_modules to cycle->modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6334
diff
changeset
|
6071 if (cf->cycle->modules[m]->type != NGX_HTTP_MODULE) { |
| 651 | 6072 continue; |
| 6073 } | |
| 6074 | |
|
6379
cf5e822cf470
Dynamic modules: changed ngx_modules to cycle->modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6334
diff
changeset
|
6075 module = cf->cycle->modules[m]->ctx; |
| 651 | 6076 |
| 884 | 6077 if (module->create_srv_conf) { |
| 6078 mconf = module->create_srv_conf(cf); | |
| 6079 if (mconf == NULL) { | |
| 6080 return NGX_CONF_ERROR; | |
| 6081 } | |
| 6082 | |
|
6379
cf5e822cf470
Dynamic modules: changed ngx_modules to cycle->modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6334
diff
changeset
|
6083 ctx->srv_conf[cf->cycle->modules[m]->ctx_index] = mconf; |
| 884 | 6084 } |
| 6085 | |
| 651 | 6086 if (module->create_loc_conf) { |
| 6087 mconf = module->create_loc_conf(cf); | |
| 6088 if (mconf == NULL) { | |
| 6089 return NGX_CONF_ERROR; | |
| 6090 } | |
| 6091 | |
|
6379
cf5e822cf470
Dynamic modules: changed ngx_modules to cycle->modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6334
diff
changeset
|
6092 ctx->loc_conf[cf->cycle->modules[m]->ctx_index] = mconf; |
| 651 | 6093 } |
| 6094 } | |
| 6095 | |
|
5728
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6096 uscf->servers = ngx_array_create(cf->pool, 4, |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6097 sizeof(ngx_http_upstream_server_t)); |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6098 if (uscf->servers == NULL) { |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6099 return NGX_CONF_ERROR; |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6100 } |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6101 |
| 651 | 6102 |
| 6103 /* parse inside upstream{} */ | |
| 6104 | |
| 6105 pcf = *cf; | |
| 6106 cf->ctx = ctx; | |
| 6107 cf->cmd_type = NGX_HTTP_UPS_CONF; | |
| 6108 | |
| 6109 rv = ngx_conf_parse(cf, NULL); | |
| 6110 | |
| 6111 *cf = pcf; | |
| 6112 | |
| 6113 if (rv != NGX_CONF_OK) { | |
| 6114 return rv; | |
| 6115 } | |
| 6116 | |
|
5728
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6117 if (uscf->servers->nelts == 0) { |
| 651 | 6118 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 6119 "no servers are inside upstream"); | |
| 6120 return NGX_CONF_ERROR; | |
| 6121 } | |
| 6122 | |
| 6123 return rv; | |
| 6124 } | |
| 6125 | |
| 6126 | |
| 6127 static char * | |
| 6128 ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 6129 { | |
| 6130 ngx_http_upstream_srv_conf_t *uscf = conf; | |
| 6131 | |
| 884 | 6132 time_t fail_timeout; |
| 6133 ngx_str_t *value, s; | |
| 6134 ngx_url_t u; | |
| 6705 | 6135 ngx_int_t weight, max_conns, max_fails; |
| 884 | 6136 ngx_uint_t i; |
| 6137 ngx_http_upstream_server_t *us; | |
| 651 | 6138 |
| 884 | 6139 us = ngx_array_push(uscf->servers); |
| 6140 if (us == NULL) { | |
| 651 | 6141 return NGX_CONF_ERROR; |
| 6142 } | |
| 6143 | |
| 884 | 6144 ngx_memzero(us, sizeof(ngx_http_upstream_server_t)); |
| 6145 | |
| 651 | 6146 value = cf->args->elts; |
| 6147 | |
| 663 | 6148 weight = 1; |
| 6705 | 6149 max_conns = 0; |
| 884 | 6150 max_fails = 1; |
| 6151 fail_timeout = 10; | |
| 6152 | |
| 6153 for (i = 2; i < cf->args->nelts; i++) { | |
| 6154 | |
| 6155 if (ngx_strncmp(value[i].data, "weight=", 7) == 0) { | |
| 6156 | |
| 6157 if (!(uscf->flags & NGX_HTTP_UPSTREAM_WEIGHT)) { | |
|
5818
fe8bafab5b49
Upstream: improved configuration parser diagnostics.
Ruslan Ermilov <ru@nginx.com>
parents:
5774
diff
changeset
|
6158 goto not_supported; |
| 884 | 6159 } |
| 6160 | |
| 6161 weight = ngx_atoi(&value[i].data[7], value[i].len - 7); | |
| 663 | 6162 |
| 6163 if (weight == NGX_ERROR || weight == 0) { | |
| 6164 goto invalid; | |
| 6165 } | |
| 6166 | |
| 884 | 6167 continue; |
| 6168 } | |
| 6169 | |
| 6705 | 6170 if (ngx_strncmp(value[i].data, "max_conns=", 10) == 0) { |
| 6171 | |
| 6172 if (!(uscf->flags & NGX_HTTP_UPSTREAM_MAX_CONNS)) { | |
| 6173 goto not_supported; | |
| 6174 } | |
| 6175 | |
| 6176 max_conns = ngx_atoi(&value[i].data[10], value[i].len - 10); | |
| 6177 | |
| 6178 if (max_conns == NGX_ERROR) { | |
| 6179 goto invalid; | |
| 6180 } | |
| 6181 | |
| 6182 continue; | |
| 6183 } | |
| 6184 | |
| 884 | 6185 if (ngx_strncmp(value[i].data, "max_fails=", 10) == 0) { |
| 6186 | |
| 6187 if (!(uscf->flags & NGX_HTTP_UPSTREAM_MAX_FAILS)) { | |
|
5818
fe8bafab5b49
Upstream: improved configuration parser diagnostics.
Ruslan Ermilov <ru@nginx.com>
parents:
5774
diff
changeset
|
6188 goto not_supported; |
| 884 | 6189 } |
| 6190 | |
| 6191 max_fails = ngx_atoi(&value[i].data[10], value[i].len - 10); | |
| 6192 | |
| 6193 if (max_fails == NGX_ERROR) { | |
| 6194 goto invalid; | |
| 6195 } | |
| 6196 | |
| 6197 continue; | |
| 663 | 6198 } |
| 884 | 6199 |
| 6200 if (ngx_strncmp(value[i].data, "fail_timeout=", 13) == 0) { | |
| 6201 | |
| 6202 if (!(uscf->flags & NGX_HTTP_UPSTREAM_FAIL_TIMEOUT)) { | |
|
5818
fe8bafab5b49
Upstream: improved configuration parser diagnostics.
Ruslan Ermilov <ru@nginx.com>
parents:
5774
diff
changeset
|
6203 goto not_supported; |
| 884 | 6204 } |
| 6205 | |
| 6206 s.len = value[i].len - 13; | |
| 6207 s.data = &value[i].data[13]; | |
| 6208 | |
| 6209 fail_timeout = ngx_parse_time(&s, 1); | |
| 6210 | |
| 4474 | 6211 if (fail_timeout == (time_t) NGX_ERROR) { |
| 884 | 6212 goto invalid; |
| 6213 } | |
| 6214 | |
| 6215 continue; | |
| 6216 } | |
| 6217 | |
|
5410
16b68c724438
Upstream: fixed "down" and "backup" parsing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5392
diff
changeset
|
6218 if (ngx_strcmp(value[i].data, "backup") == 0) { |
| 1378 | 6219 |
| 6220 if (!(uscf->flags & NGX_HTTP_UPSTREAM_BACKUP)) { | |
|
5818
fe8bafab5b49
Upstream: improved configuration parser diagnostics.
Ruslan Ermilov <ru@nginx.com>
parents:
5774
diff
changeset
|
6221 goto not_supported; |
| 1378 | 6222 } |
| 6223 | |
| 6224 us->backup = 1; | |
| 6225 | |
| 6226 continue; | |
| 6227 } | |
| 6228 | |
|
5410
16b68c724438
Upstream: fixed "down" and "backup" parsing.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5392
diff
changeset
|
6229 if (ngx_strcmp(value[i].data, "down") == 0) { |
| 884 | 6230 |
| 6231 if (!(uscf->flags & NGX_HTTP_UPSTREAM_DOWN)) { | |
|
5818
fe8bafab5b49
Upstream: improved configuration parser diagnostics.
Ruslan Ermilov <ru@nginx.com>
parents:
5774
diff
changeset
|
6232 goto not_supported; |
| 884 | 6233 } |
| 6234 | |
| 6235 us->down = 1; | |
| 6236 | |
| 6237 continue; | |
| 6238 } | |
| 6239 | |
| 6240 goto invalid; | |
| 663 | 6241 } |
| 6242 | |
|
5728
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6243 ngx_memzero(&u, sizeof(ngx_url_t)); |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6244 |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6245 u.url = value[1]; |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6246 u.default_port = 80; |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6247 |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6248 if (ngx_parse_url(cf->pool, &u) != NGX_OK) { |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6249 if (u.err) { |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6250 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6251 "%s in upstream \"%V\"", u.err, &u.url); |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6252 } |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6253 |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6254 return NGX_CONF_ERROR; |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6255 } |
|
63d7d69d0fe4
Upstream: reduced diffs to the plus version of nginx.
Ruslan Ermilov <ru@nginx.com>
parents:
5717
diff
changeset
|
6256 |
|
5717
efc84a5723b3
Upstream: generic hash module.
Roman Arutyunyan <arut@nginx.com>
parents:
5682
diff
changeset
|
6257 us->name = u.url; |
| 884 | 6258 us->addrs = u.addrs; |
| 6259 us->naddrs = u.naddrs; | |
| 6260 us->weight = weight; | |
| 6705 | 6261 us->max_conns = max_conns; |
| 884 | 6262 us->max_fails = max_fails; |
| 6263 us->fail_timeout = fail_timeout; | |
| 651 | 6264 |
| 6265 return NGX_CONF_OK; | |
| 663 | 6266 |
| 6267 invalid: | |
| 6268 | |
| 884 | 6269 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 6270 "invalid parameter \"%V\"", &value[i]); | |
| 663 | 6271 |
| 6272 return NGX_CONF_ERROR; | |
|
5818
fe8bafab5b49
Upstream: improved configuration parser diagnostics.
Ruslan Ermilov <ru@nginx.com>
parents:
5774
diff
changeset
|
6273 |
|
fe8bafab5b49
Upstream: improved configuration parser diagnostics.
Ruslan Ermilov <ru@nginx.com>
parents:
5774
diff
changeset
|
6274 not_supported: |
|
fe8bafab5b49
Upstream: improved configuration parser diagnostics.
Ruslan Ermilov <ru@nginx.com>
parents:
5774
diff
changeset
|
6275 |
|
fe8bafab5b49
Upstream: improved configuration parser diagnostics.
Ruslan Ermilov <ru@nginx.com>
parents:
5774
diff
changeset
|
6276 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
fe8bafab5b49
Upstream: improved configuration parser diagnostics.
Ruslan Ermilov <ru@nginx.com>
parents:
5774
diff
changeset
|
6277 "balancing method does not support parameter \"%V\"", |
|
fe8bafab5b49
Upstream: improved configuration parser diagnostics.
Ruslan Ermilov <ru@nginx.com>
parents:
5774
diff
changeset
|
6278 &value[i]); |
|
fe8bafab5b49
Upstream: improved configuration parser diagnostics.
Ruslan Ermilov <ru@nginx.com>
parents:
5774
diff
changeset
|
6279 |
|
fe8bafab5b49
Upstream: improved configuration parser diagnostics.
Ruslan Ermilov <ru@nginx.com>
parents:
5774
diff
changeset
|
6280 return NGX_CONF_ERROR; |
| 651 | 6281 } |
| 6282 | |
| 6283 | |
| 6284 ngx_http_upstream_srv_conf_t * | |
| 884 | 6285 ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags) |
| 651 | 6286 { |
| 6287 ngx_uint_t i; | |
| 884 | 6288 ngx_http_upstream_server_t *us; |
| 651 | 6289 ngx_http_upstream_srv_conf_t *uscf, **uscfp; |
| 6290 ngx_http_upstream_main_conf_t *umcf; | |
| 6291 | |
| 884 | 6292 if (!(flags & NGX_HTTP_UPSTREAM_CREATE)) { |
| 6293 | |
|
1559
fe11e2a3946d
use pool instead of ngx_conf_t
Igor Sysoev <igor@sysoev.ru>
parents:
1558
diff
changeset
|
6294 if (ngx_parse_url(cf->pool, u) != NGX_OK) { |
| 651 | 6295 if (u->err) { |
| 6296 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 6297 "%s in upstream \"%V\"", u->err, &u->url); | |
| 6298 } | |
| 6299 | |
| 6300 return NULL; | |
| 6301 } | |
| 6302 } | |
| 6303 | |
| 6304 umcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_upstream_module); | |
| 6305 | |
| 6306 uscfp = umcf->upstreams.elts; | |
| 6307 | |
| 6308 for (i = 0; i < umcf->upstreams.nelts; i++) { | |
| 906 | 6309 |
| 6310 if (uscfp[i]->host.len != u->host.len | |
| 884 | 6311 || ngx_strncasecmp(uscfp[i]->host.data, u->host.data, u->host.len) |
| 6312 != 0) | |
| 6313 { | |
| 651 | 6314 continue; |
| 6315 } | |
| 6316 | |
| 884 | 6317 if ((flags & NGX_HTTP_UPSTREAM_CREATE) |
| 6318 && (uscfp[i]->flags & NGX_HTTP_UPSTREAM_CREATE)) | |
| 651 | 6319 { |
| 884 | 6320 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 6321 "duplicate upstream \"%V\"", &u->host); | |
| 6322 return NULL; | |
| 651 | 6323 } |
| 884 | 6324 |
|
5005
c9059bd5445b
Fixed "proxy_pass" with IP address and no port (ticket #276).
Ruslan Ermilov <ru@nginx.com>
parents:
4990
diff
changeset
|
6325 if ((uscfp[i]->flags & NGX_HTTP_UPSTREAM_CREATE) && !u->no_port) { |
|
6699
9cf2dce316e5
Fixed log levels of configuration parsing errors.
Valentin Bartenev <vbart@nginx.com>
parents:
6654
diff
changeset
|
6326 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 906 | 6327 "upstream \"%V\" may not have port %d", |
| 6328 &u->host, u->port); | |
| 6329 return NULL; | |
| 6330 } | |
| 6331 | |
|
5005
c9059bd5445b
Fixed "proxy_pass" with IP address and no port (ticket #276).
Ruslan Ermilov <ru@nginx.com>
parents:
4990
diff
changeset
|
6332 if ((flags & NGX_HTTP_UPSTREAM_CREATE) && !uscfp[i]->no_port) { |
|
6699
9cf2dce316e5
Fixed log levels of configuration parsing errors.
Valentin Bartenev <vbart@nginx.com>
parents:
6654
diff
changeset
|
6333 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, |
| 906 | 6334 "upstream \"%V\" may not have port %d in %s:%ui", |
| 6335 &u->host, uscfp[i]->port, | |
|
1489
56f1ea5baabb
u_char* is enough to keep file name
Igor Sysoev <igor@sysoev.ru>
parents:
1469
diff
changeset
|
6336 uscfp[i]->file_name, uscfp[i]->line); |
| 906 | 6337 return NULL; |
| 6338 } | |
| 6339 | |
|
5005
c9059bd5445b
Fixed "proxy_pass" with IP address and no port (ticket #276).
Ruslan Ermilov <ru@nginx.com>
parents:
4990
diff
changeset
|
6340 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
|
6341 && 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
|
6342 { |
| 906 | 6343 continue; |
| 884 | 6344 } |
| 6345 | |
|
4152
65c1c241d70e
Better handling of late upstream creation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4151
diff
changeset
|
6346 if (flags & NGX_HTTP_UPSTREAM_CREATE) { |
|
65c1c241d70e
Better handling of late upstream creation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4151
diff
changeset
|
6347 uscfp[i]->flags = flags; |
|
6787
640e1e778de6
Upstream: consistently initialize explicit upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6786
diff
changeset
|
6348 uscfp[i]->port = 0; |
|
4152
65c1c241d70e
Better handling of late upstream creation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4151
diff
changeset
|
6349 } |
|
65c1c241d70e
Better handling of late upstream creation.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4151
diff
changeset
|
6350 |
| 884 | 6351 return uscfp[i]; |
| 651 | 6352 } |
| 6353 | |
| 6354 uscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_srv_conf_t)); | |
| 6355 if (uscf == NULL) { | |
| 6356 return NULL; | |
| 6357 } | |
| 6358 | |
| 884 | 6359 uscf->flags = flags; |
| 651 | 6360 uscf->host = u->host; |
|
1489
56f1ea5baabb
u_char* is enough to keep file name
Igor Sysoev <igor@sysoev.ru>
parents:
1469
diff
changeset
|
6361 uscf->file_name = cf->conf_file->file.name.data; |
| 651 | 6362 uscf->line = cf->conf_file->line; |
| 906 | 6363 uscf->port = u->port; |
|
5005
c9059bd5445b
Fixed "proxy_pass" with IP address and no port (ticket #276).
Ruslan Ermilov <ru@nginx.com>
parents:
4990
diff
changeset
|
6364 uscf->no_port = u->no_port; |
| 884 | 6365 |
|
5977
26c127bab5ef
Upstream: detect port absence in fastcgi_pass with IP literal.
Ruslan Ermilov <ru@nginx.com>
parents:
5968
diff
changeset
|
6366 if (u->naddrs == 1 && (u->port || u->family == AF_UNIX)) { |
| 884 | 6367 uscf->servers = ngx_array_create(cf->pool, 1, |
| 6368 sizeof(ngx_http_upstream_server_t)); | |
| 6369 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
|
6370 return NULL; |
| 884 | 6371 } |
| 6372 | |
| 6373 us = ngx_array_push(uscf->servers); | |
| 6374 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
|
6375 return NULL; |
| 884 | 6376 } |
| 6377 | |
| 6378 ngx_memzero(us, sizeof(ngx_http_upstream_server_t)); | |
| 6379 | |
| 6380 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
|
6381 us->naddrs = 1; |
| 884 | 6382 } |
| 651 | 6383 |
| 6384 uscfp = ngx_array_push(&umcf->upstreams); | |
| 6385 if (uscfp == NULL) { | |
| 6386 return NULL; | |
| 6387 } | |
| 6388 | |
| 6389 *uscfp = uscf; | |
| 6390 | |
| 6391 return uscf; | |
| 6392 } | |
| 6393 | |
| 6394 | |
|
3271
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
6395 char * |
| 3399 | 6396 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
|
6397 void *conf) |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
6398 { |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
6399 char *p = conf; |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
6400 |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6401 ngx_int_t rc; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6402 ngx_str_t *value; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6403 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
|
6404 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
|
6405 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
|
6406 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6407 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
|
6408 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6409 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
|
6410 return "is duplicate"; |
|
3271
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
6411 } |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
6412 |
|
3272
98f49b2bcae8
change ngx_parse_addr() interface
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
6413 value = cf->args->elts; |
|
98f49b2bcae8
change ngx_parse_addr() interface
Igor Sysoev <igor@sysoev.ru>
parents:
3271
diff
changeset
|
6414 |
|
6530
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6415 if (cf->args->nelts == 2 && ngx_strcmp(value[1].data, "off") == 0) { |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6416 *plocal = NULL; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6417 return NGX_CONF_OK; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6418 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6419 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6420 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
|
6421 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6422 ccv.cf = cf; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6423 ccv.value = &value[1]; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6424 ccv.complex_value = &cv; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6425 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6426 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
|
6427 return NGX_CONF_ERROR; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6428 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6429 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6430 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
|
6431 if (local == NULL) { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6432 return NGX_CONF_ERROR; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6433 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6434 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6435 *plocal = local; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6436 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6437 if (cv.lengths) { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6438 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
|
6439 if (local->value == NULL) { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6440 return NGX_CONF_ERROR; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6441 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6442 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6443 *local->value = cv; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6444 |
|
6528
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6445 } else { |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6446 local->addr = ngx_palloc(cf->pool, sizeof(ngx_addr_t)); |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6447 if (local->addr == NULL) { |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6448 return NGX_CONF_ERROR; |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6449 } |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6450 |
|
6594
3c87b82b17d4
Upstream: support for port in proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6536
diff
changeset
|
6451 rc = ngx_parse_addr_port(cf->pool, local->addr, value[1].data, |
|
3c87b82b17d4
Upstream: support for port in proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6536
diff
changeset
|
6452 value[1].len); |
|
6528
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6453 |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6454 switch (rc) { |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6455 case NGX_OK: |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6456 local->addr->name = value[1]; |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6457 break; |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6458 |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6459 case NGX_DECLINED: |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6460 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6461 "invalid address \"%V\"", &value[1]); |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6462 /* fall through */ |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6463 |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6464 default: |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6465 return NGX_CONF_ERROR; |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6466 } |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6467 } |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6468 |
|
6530
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6469 if (cf->args->nelts > 2) { |
|
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6470 if (ngx_strcmp(value[2].data, "transparent") == 0) { |
|
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6471 #if (NGX_HAVE_TRANSPARENT_PROXY) |
|
7174
84e53e4735a4
Retain CAP_NET_RAW capability for transparent proxying.
Roman Arutyunyan <arut@nginx.com>
parents:
7166
diff
changeset
|
6472 ngx_core_conf_t *ccf; |
|
84e53e4735a4
Retain CAP_NET_RAW capability for transparent proxying.
Roman Arutyunyan <arut@nginx.com>
parents:
7166
diff
changeset
|
6473 |
|
84e53e4735a4
Retain CAP_NET_RAW capability for transparent proxying.
Roman Arutyunyan <arut@nginx.com>
parents:
7166
diff
changeset
|
6474 ccf = (ngx_core_conf_t *) ngx_get_conf(cf->cycle->conf_ctx, |
|
84e53e4735a4
Retain CAP_NET_RAW capability for transparent proxying.
Roman Arutyunyan <arut@nginx.com>
parents:
7166
diff
changeset
|
6475 ngx_core_module); |
|
84e53e4735a4
Retain CAP_NET_RAW capability for transparent proxying.
Roman Arutyunyan <arut@nginx.com>
parents:
7166
diff
changeset
|
6476 |
|
84e53e4735a4
Retain CAP_NET_RAW capability for transparent proxying.
Roman Arutyunyan <arut@nginx.com>
parents:
7166
diff
changeset
|
6477 ccf->transparent = 1; |
|
6530
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6478 local->transparent = 1; |
|
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6479 #else |
|
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6480 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6481 "transparent proxying is not supported " |
|
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6482 "on this platform, ignored"); |
|
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6483 #endif |
|
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6484 } else { |
|
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6485 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6486 "invalid parameter \"%V\"", &value[2]); |
|
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6487 return NGX_CONF_ERROR; |
|
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6488 } |
|
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6489 } |
|
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6490 |
|
6528
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6491 return NGX_CONF_OK; |
|
3271
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
6492 } |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
6493 |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3198
diff
changeset
|
6494 |
|
6528
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6495 static ngx_int_t |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6496 ngx_http_upstream_set_local(ngx_http_request_t *r, ngx_http_upstream_t *u, |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6497 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
|
6498 { |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6499 ngx_int_t rc; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6500 ngx_str_t val; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6501 ngx_addr_t *addr; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6502 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6503 if (local == NULL) { |
|
6528
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6504 u->peer.local = NULL; |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6505 return NGX_OK; |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6506 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6507 |
|
6530
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6508 #if (NGX_HAVE_TRANSPARENT_PROXY) |
|
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6509 u->peer.transparent = local->transparent; |
|
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6510 #endif |
|
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6528
diff
changeset
|
6511 |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6512 if (local->value == NULL) { |
|
6528
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6513 u->peer.local = local->addr; |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6514 return NGX_OK; |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6515 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6516 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6517 if (ngx_http_complex_value(r, local->value, &val) != NGX_OK) { |
|
6528
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6518 return NGX_ERROR; |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6519 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6520 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6521 if (val.len == 0) { |
|
6528
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6522 return NGX_OK; |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6523 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6524 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6525 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
|
6526 if (addr == NULL) { |
|
6528
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6527 return NGX_ERROR; |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6528 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6529 |
|
6594
3c87b82b17d4
Upstream: support for port in proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6536
diff
changeset
|
6530 rc = ngx_parse_addr_port(r->pool, addr, val.data, val.len); |
|
6528
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6531 if (rc == NGX_ERROR) { |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6532 return NGX_ERROR; |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6533 } |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6534 |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6535 if (rc != NGX_OK) { |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6536 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
|
6537 "invalid local address \"%V\"", &val); |
|
6528
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6538 return NGX_OK; |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6539 } |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6540 |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6541 addr->name = val; |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6542 u->peer.local = addr; |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6543 |
|
88f012eee7d8
Upstream: prepared proxy_bind to accept parameters.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
6544 return NGX_OK; |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6545 } |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6546 |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
5005
diff
changeset
|
6547 |
|
4328
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6548 char * |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6549 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
|
6550 void *conf) |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6551 { |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6552 char *p = conf; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6553 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6554 ngx_str_t *value; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6555 ngx_array_t **a; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6556 ngx_http_upstream_param_t *param; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6557 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6558 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
|
6559 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6560 if (*a == NULL) { |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6561 *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
|
6562 if (*a == NULL) { |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6563 return NGX_CONF_ERROR; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6564 } |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6565 } |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6566 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6567 param = ngx_array_push(*a); |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6568 if (param == NULL) { |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6569 return NGX_CONF_ERROR; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6570 } |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6571 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6572 value = cf->args->elts; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6573 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6574 param->key = value[1]; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6575 param->value = value[2]; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6576 param->skip_empty = 0; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6577 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6578 if (cf->args->nelts == 4) { |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6579 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
|
6580 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
|
6581 "invalid parameter \"%V\"", &value[3]); |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6582 return NGX_CONF_ERROR; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6583 } |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6584 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6585 param->skip_empty = 1; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6586 } |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6587 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6588 return NGX_CONF_OK; |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6589 } |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6590 |
|
d15a00e6d9e6
Added the ngx_http_upstream_param_set_slot().
Valentin Bartenev <vbart@nginx.com>
parents:
4298
diff
changeset
|
6591 |
|
1701
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6592 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
|
6593 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
|
6594 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
|
6595 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
|
6596 { |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6597 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
|
6598 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
|
6599 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
|
6600 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
|
6601 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6602 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
|
6603 && 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
|
6604 { |
|
4769
f88555d76886
Upstream: hide_headers/pass_headers inheritance fix.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4766
diff
changeset
|
6605 conf->hide_headers = prev->hide_headers; |
|
f88555d76886
Upstream: hide_headers/pass_headers inheritance fix.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4766
diff
changeset
|
6606 conf->pass_headers = prev->pass_headers; |
|
f88555d76886
Upstream: hide_headers/pass_headers inheritance fix.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4766
diff
changeset
|
6607 |
|
1701
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6608 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
|
6609 |
|
6744
7e5199f172fb
Upstream: hide_headers_hash inherited regardless of cache settings.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6705
diff
changeset
|
6610 if (conf->hide_headers_hash.buckets) { |
|
1701
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6611 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
|
6612 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6613 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6614 } else { |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6615 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
|
6616 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
|
6617 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6618 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6619 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
|
6620 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
|
6621 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6622 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6623 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6624 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
|
6625 != NGX_OK) |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6626 { |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6627 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
|
6628 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6629 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6630 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
|
6631 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
|
6632 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
|
6633 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
|
6634 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6635 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6636 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
|
6637 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
|
6638 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
|
6639 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6640 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6641 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
|
6642 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6643 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
|
6644 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6645 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
|
6646 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6647 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
|
6648 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6649 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
|
6650 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
|
6651 goto exist; |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6652 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6653 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6654 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6655 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
|
6656 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
|
6657 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
|
6658 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6659 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6660 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
|
6661 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
|
6662 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
|
6663 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6664 exist: |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6665 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6666 continue; |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6667 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6668 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6669 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6670 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
|
6671 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6672 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
|
6673 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
|
6674 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6675 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
|
6676 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
|
6677 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6678 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
|
6679 continue; |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6680 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6681 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6682 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
|
6683 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
|
6684 break; |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6685 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6686 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6687 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6688 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6689 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6690 hash->hash = &conf->hide_headers_hash; |
|
1706
9242e21d2f8d
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1705
diff
changeset
|
6691 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
|
6692 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
|
6693 hash->temp_pool = NULL; |
|
1706
9242e21d2f8d
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1705
diff
changeset
|
6694 |
|
6745
93121485c39b
Upstream: hide_headers_hash handling at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6744
diff
changeset
|
6695 if (ngx_hash_init(hash, hide_headers.elts, hide_headers.nelts) != NGX_OK) { |
|
93121485c39b
Upstream: hide_headers_hash handling at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6744
diff
changeset
|
6696 return NGX_ERROR; |
|
93121485c39b
Upstream: hide_headers_hash handling at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6744
diff
changeset
|
6697 } |
|
93121485c39b
Upstream: hide_headers_hash handling at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6744
diff
changeset
|
6698 |
|
93121485c39b
Upstream: hide_headers_hash handling at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6744
diff
changeset
|
6699 /* |
|
93121485c39b
Upstream: hide_headers_hash handling at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6744
diff
changeset
|
6700 * special handling to preserve conf->hide_headers_hash |
|
93121485c39b
Upstream: hide_headers_hash handling at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6744
diff
changeset
|
6701 * in the "http" section to inherit it to all servers |
|
93121485c39b
Upstream: hide_headers_hash handling at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6744
diff
changeset
|
6702 */ |
|
93121485c39b
Upstream: hide_headers_hash handling at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6744
diff
changeset
|
6703 |
|
93121485c39b
Upstream: hide_headers_hash handling at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6744
diff
changeset
|
6704 if (prev->hide_headers_hash.buckets == NULL |
|
93121485c39b
Upstream: hide_headers_hash handling at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6744
diff
changeset
|
6705 && conf->hide_headers == prev->hide_headers |
|
93121485c39b
Upstream: hide_headers_hash handling at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6744
diff
changeset
|
6706 && conf->pass_headers == prev->pass_headers) |
|
93121485c39b
Upstream: hide_headers_hash handling at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6744
diff
changeset
|
6707 { |
|
93121485c39b
Upstream: hide_headers_hash handling at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6744
diff
changeset
|
6708 prev->hide_headers_hash = conf->hide_headers_hash; |
|
93121485c39b
Upstream: hide_headers_hash handling at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6744
diff
changeset
|
6709 } |
|
93121485c39b
Upstream: hide_headers_hash handling at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6744
diff
changeset
|
6710 |
|
93121485c39b
Upstream: hide_headers_hash handling at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6744
diff
changeset
|
6711 return NGX_OK; |
|
1701
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6712 } |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6713 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
6714 |
| 509 | 6715 static void * |
| 6716 ngx_http_upstream_create_main_conf(ngx_conf_t *cf) | |
| 6717 { | |
| 6718 ngx_http_upstream_main_conf_t *umcf; | |
| 6719 | |
| 6720 umcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_main_conf_t)); | |
| 6721 if (umcf == NULL) { | |
| 6722 return NULL; | |
| 6723 } | |
| 6724 | |
| 651 | 6725 if (ngx_array_init(&umcf->upstreams, cf->pool, 4, |
| 6726 sizeof(ngx_http_upstream_srv_conf_t *)) | |
| 6727 != NGX_OK) | |
| 6728 { | |
|
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2882
diff
changeset
|
6729 return NULL; |
| 651 | 6730 } |
| 6731 | |
| 509 | 6732 return umcf; |
| 6733 } | |
| 6734 | |
| 6735 | |
| 6736 static char * | |
| 651 | 6737 ngx_http_upstream_init_main_conf(ngx_conf_t *cf, void *conf) |
| 509 | 6738 { |
| 6739 ngx_http_upstream_main_conf_t *umcf = conf; | |
| 6740 | |
| 651 | 6741 ngx_uint_t i; |
| 6742 ngx_array_t headers_in; | |
| 6743 ngx_hash_key_t *hk; | |
| 6744 ngx_hash_init_t hash; | |
| 884 | 6745 ngx_http_upstream_init_pt init; |
| 651 | 6746 ngx_http_upstream_header_t *header; |
| 6747 ngx_http_upstream_srv_conf_t **uscfp; | |
| 6748 | |
| 6749 uscfp = umcf->upstreams.elts; | |
| 6750 | |
| 6751 for (i = 0; i < umcf->upstreams.nelts; i++) { | |
| 884 | 6752 |
| 6753 init = uscfp[i]->peer.init_upstream ? uscfp[i]->peer.init_upstream: | |
| 6754 ngx_http_upstream_init_round_robin; | |
| 6755 | |
| 6756 if (init(cf, uscfp[i]) != NGX_OK) { | |
| 651 | 6757 return NGX_CONF_ERROR; |
| 6758 } | |
| 6759 } | |
| 649 | 6760 |
| 663 | 6761 |
| 884 | 6762 /* upstream_headers_in_hash */ |
| 6763 | |
| 649 | 6764 if (ngx_array_init(&headers_in, cf->temp_pool, 32, sizeof(ngx_hash_key_t)) |
| 6765 != NGX_OK) | |
| 509 | 6766 { |
| 6767 return NGX_CONF_ERROR; | |
| 6768 } | |
| 6769 | |
| 649 | 6770 for (header = ngx_http_upstream_headers_in; header->name.len; header++) { |
| 6771 hk = ngx_array_push(&headers_in); | |
| 6772 if (hk == NULL) { | |
| 6773 return NGX_CONF_ERROR; | |
| 6774 } | |
| 6775 | |
| 6776 hk->key = header->name; | |
| 6777 hk->key_hash = ngx_hash_key_lc(header->name.data, header->name.len); | |
| 6778 hk->value = header; | |
| 6779 } | |
| 6780 | |
| 6781 hash.hash = &umcf->headers_in_hash; | |
| 6782 hash.key = ngx_hash_key_lc; | |
| 6783 hash.max_size = 512; | |
|
751
bae59a740c40
align hash bucket size to cache line
Igor Sysoev <igor@sysoev.ru>
parents:
750
diff
changeset
|
6784 hash.bucket_size = ngx_align(64, ngx_cacheline_size); |
| 649 | 6785 hash.name = "upstream_headers_in_hash"; |
| 6786 hash.pool = cf->pool; | |
| 6787 hash.temp_pool = NULL; | |
| 6788 | |
| 6789 if (ngx_hash_init(&hash, headers_in.elts, headers_in.nelts) != NGX_OK) { | |
| 6790 return NGX_CONF_ERROR; | |
| 6791 } | |
| 509 | 6792 |
| 6793 return NGX_CONF_OK; | |
| 6794 } |