Mercurial > hg > nginx
annotate src/http/modules/ngx_http_scgi_module.c @ 7933:2f443cac3f1e
Upstream: fixed logging level of upstream invalid header errors.
In b87b7092cedb (nginx 1.21.1), logging level of "upstream sent invalid
header" errors was accidentally changed to "info". This change restores
the "error" level, which is a proper logging level for upstream-side
errors.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 18 Oct 2021 16:46:59 +0300 |
| parents | b87b7092cedb |
| children | 75af96daee97 |
| rev | line source |
|---|---|
| 3637 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4412 | 4 * Copyright (C) Nginx, Inc. |
| 3637 | 5 * Copyright (C) Manlio Perillo (manlio.perillo@gmail.com) |
| 6 */ | |
| 7 | |
| 8 | |
| 9 #include <ngx_config.h> | |
| 10 #include <ngx_core.h> | |
| 11 #include <ngx_http.h> | |
| 12 | |
| 13 | |
| 14 typedef struct { | |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
15 ngx_array_t caches; /* ngx_http_file_cache_t * */ |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
16 } ngx_http_scgi_main_conf_t; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
17 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
18 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
19 typedef struct { |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
20 ngx_array_t *flushes; |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
21 ngx_array_t *lengths; |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
22 ngx_array_t *values; |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
23 ngx_uint_t number; |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
24 ngx_hash_t hash; |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
25 } ngx_http_scgi_params_t; |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
26 |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
27 |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
28 typedef struct { |
| 3637 | 29 ngx_http_upstream_conf_t upstream; |
| 30 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
31 ngx_http_scgi_params_t params; |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
32 #if (NGX_HTTP_CACHE) |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
33 ngx_http_scgi_params_t params_cache; |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
34 #endif |
| 3637 | 35 ngx_array_t *params_source; |
| 36 | |
| 37 ngx_array_t *scgi_lengths; | |
| 38 ngx_array_t *scgi_values; | |
| 39 | |
| 40 #if (NGX_HTTP_CACHE) | |
| 41 ngx_http_complex_value_t cache_key; | |
| 42 #endif | |
| 43 } ngx_http_scgi_loc_conf_t; | |
| 44 | |
| 45 | |
| 46 static ngx_int_t ngx_http_scgi_eval(ngx_http_request_t *r, | |
| 47 ngx_http_scgi_loc_conf_t *scf); | |
| 48 static ngx_int_t ngx_http_scgi_create_request(ngx_http_request_t *r); | |
| 49 static ngx_int_t ngx_http_scgi_reinit_request(ngx_http_request_t *r); | |
| 50 static ngx_int_t ngx_http_scgi_process_status_line(ngx_http_request_t *r); | |
| 51 static ngx_int_t ngx_http_scgi_process_header(ngx_http_request_t *r); | |
|
7678
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
52 static ngx_int_t ngx_http_scgi_input_filter_init(void *data); |
| 3637 | 53 static void ngx_http_scgi_abort_request(ngx_http_request_t *r); |
| 54 static void ngx_http_scgi_finalize_request(ngx_http_request_t *r, ngx_int_t rc); | |
| 55 | |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
56 static void *ngx_http_scgi_create_main_conf(ngx_conf_t *cf); |
| 3637 | 57 static void *ngx_http_scgi_create_loc_conf(ngx_conf_t *cf); |
| 58 static char *ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, | |
| 59 void *child); | |
|
5907
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5906
diff
changeset
|
60 static ngx_int_t ngx_http_scgi_init_params(ngx_conf_t *cf, |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
61 ngx_http_scgi_loc_conf_t *conf, ngx_http_scgi_params_t *params, |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
62 ngx_keyval_t *default_params); |
| 3637 | 63 |
| 64 static char *ngx_http_scgi_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); | |
| 65 static char *ngx_http_scgi_store(ngx_conf_t *cf, ngx_command_t *cmd, | |
| 66 void *conf); | |
| 67 | |
| 68 #if (NGX_HTTP_CACHE) | |
| 69 static ngx_int_t ngx_http_scgi_create_key(ngx_http_request_t *r); | |
| 70 static char *ngx_http_scgi_cache(ngx_conf_t *cf, ngx_command_t *cmd, | |
| 71 void *conf); | |
| 72 static char *ngx_http_scgi_cache_key(ngx_conf_t *cf, ngx_command_t *cmd, | |
| 73 void *conf); | |
| 74 #endif | |
| 75 | |
| 76 | |
| 77 static ngx_conf_bitmask_t ngx_http_scgi_next_upstream_masks[] = { | |
| 78 { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR }, | |
| 79 { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT }, | |
| 80 { ngx_string("invalid_header"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER }, | |
|
6467
91c8d990fb45
Upstream: proxy_next_upstream non_idempotent.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6303
diff
changeset
|
81 { ngx_string("non_idempotent"), NGX_HTTP_UPSTREAM_FT_NON_IDEMPOTENT }, |
| 3637 | 82 { ngx_string("http_500"), NGX_HTTP_UPSTREAM_FT_HTTP_500 }, |
| 83 { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 }, | |
|
5231
05c53652e7b4
Upstream: http_403 support in proxy_next_upstream (and friends).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5080
diff
changeset
|
84 { ngx_string("http_403"), NGX_HTTP_UPSTREAM_FT_HTTP_403 }, |
| 3637 | 85 { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 }, |
|
6966
fa56ab75cffc
Upstream: allow recovery from "429 Too Many Requests" response.
Piotr Sikora <piotrsikora@google.com>
parents:
6906
diff
changeset
|
86 { ngx_string("http_429"), NGX_HTTP_UPSTREAM_FT_HTTP_429 }, |
| 3637 | 87 { ngx_string("updating"), NGX_HTTP_UPSTREAM_FT_UPDATING }, |
| 88 { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF }, | |
| 89 { ngx_null_string, 0 } | |
| 90 }; | |
| 91 | |
| 92 | |
| 93 ngx_module_t ngx_http_scgi_module; | |
| 94 | |
| 95 | |
| 96 static ngx_command_t ngx_http_scgi_commands[] = { | |
| 97 | |
| 98 { ngx_string("scgi_pass"), | |
| 99 NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1, | |
| 100 ngx_http_scgi_pass, | |
| 101 NGX_HTTP_LOC_CONF_OFFSET, | |
| 102 0, | |
| 103 NULL }, | |
| 104 | |
| 105 { ngx_string("scgi_store"), | |
| 106 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 107 ngx_http_scgi_store, | |
| 108 NGX_HTTP_LOC_CONF_OFFSET, | |
| 109 0, | |
| 110 NULL }, | |
| 111 | |
| 112 { ngx_string("scgi_store_access"), | |
| 113 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE123, | |
| 114 ngx_conf_set_access_slot, | |
| 115 NGX_HTTP_LOC_CONF_OFFSET, | |
| 116 offsetof(ngx_http_scgi_loc_conf_t, upstream.store_access), | |
| 117 NULL }, | |
| 118 | |
|
4157
9d59a8eda373
Added uwsgi_buffering and scgi_buffering directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
119 { ngx_string("scgi_buffering"), |
|
9d59a8eda373
Added uwsgi_buffering and scgi_buffering directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
120 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, |
|
9d59a8eda373
Added uwsgi_buffering and scgi_buffering directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
121 ngx_conf_set_flag_slot, |
|
9d59a8eda373
Added uwsgi_buffering and scgi_buffering directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
122 NGX_HTTP_LOC_CONF_OFFSET, |
|
9d59a8eda373
Added uwsgi_buffering and scgi_buffering directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
123 offsetof(ngx_http_scgi_loc_conf_t, upstream.buffering), |
|
9d59a8eda373
Added uwsgi_buffering and scgi_buffering directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
124 NULL }, |
|
9d59a8eda373
Added uwsgi_buffering and scgi_buffering directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
125 |
|
6053
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
126 { ngx_string("scgi_request_buffering"), |
|
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
127 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, |
|
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
128 ngx_conf_set_flag_slot, |
|
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
129 NGX_HTTP_LOC_CONF_OFFSET, |
|
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
130 offsetof(ngx_http_scgi_loc_conf_t, upstream.request_buffering), |
|
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
131 NULL }, |
|
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
132 |
| 3637 | 133 { ngx_string("scgi_ignore_client_abort"), |
| 134 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
| 135 ngx_conf_set_flag_slot, | |
| 136 NGX_HTTP_LOC_CONF_OFFSET, | |
| 137 offsetof(ngx_http_scgi_loc_conf_t, upstream.ignore_client_abort), | |
| 138 NULL }, | |
| 139 | |
| 140 { ngx_string("scgi_bind"), | |
|
6530
1d0e03db9f8e
Upstream: the "transparent" parameter of proxy_bind and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6474
diff
changeset
|
141 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12, |
| 3637 | 142 ngx_http_upstream_bind_set_slot, |
| 143 NGX_HTTP_LOC_CONF_OFFSET, | |
| 144 offsetof(ngx_http_scgi_loc_conf_t, upstream.local), | |
| 145 NULL }, | |
| 146 | |
|
7371
8b68d50090e4
Upstream: proxy_socket_keepalive and friends.
Vladimir Homutov <vl@nginx.com>
parents:
7321
diff
changeset
|
147 { ngx_string("scgi_socket_keepalive"), |
|
8b68d50090e4
Upstream: proxy_socket_keepalive and friends.
Vladimir Homutov <vl@nginx.com>
parents:
7321
diff
changeset
|
148 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, |
|
8b68d50090e4
Upstream: proxy_socket_keepalive and friends.
Vladimir Homutov <vl@nginx.com>
parents:
7321
diff
changeset
|
149 ngx_conf_set_flag_slot, |
|
8b68d50090e4
Upstream: proxy_socket_keepalive and friends.
Vladimir Homutov <vl@nginx.com>
parents:
7321
diff
changeset
|
150 NGX_HTTP_LOC_CONF_OFFSET, |
|
8b68d50090e4
Upstream: proxy_socket_keepalive and friends.
Vladimir Homutov <vl@nginx.com>
parents:
7321
diff
changeset
|
151 offsetof(ngx_http_scgi_loc_conf_t, upstream.socket_keepalive), |
|
8b68d50090e4
Upstream: proxy_socket_keepalive and friends.
Vladimir Homutov <vl@nginx.com>
parents:
7321
diff
changeset
|
152 NULL }, |
|
8b68d50090e4
Upstream: proxy_socket_keepalive and friends.
Vladimir Homutov <vl@nginx.com>
parents:
7321
diff
changeset
|
153 |
| 3637 | 154 { ngx_string("scgi_connect_timeout"), |
| 155 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 156 ngx_conf_set_msec_slot, | |
| 157 NGX_HTTP_LOC_CONF_OFFSET, | |
| 158 offsetof(ngx_http_scgi_loc_conf_t, upstream.connect_timeout), | |
| 159 NULL }, | |
| 160 | |
| 161 { ngx_string("scgi_send_timeout"), | |
| 162 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 163 ngx_conf_set_msec_slot, | |
| 164 NGX_HTTP_LOC_CONF_OFFSET, | |
| 165 offsetof(ngx_http_scgi_loc_conf_t, upstream.send_timeout), | |
| 166 NULL }, | |
| 167 | |
| 168 { ngx_string("scgi_buffer_size"), | |
| 169 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 170 ngx_conf_set_size_slot, | |
| 171 NGX_HTTP_LOC_CONF_OFFSET, | |
| 172 offsetof(ngx_http_scgi_loc_conf_t, upstream.buffer_size), | |
| 173 NULL }, | |
| 174 | |
| 175 { ngx_string("scgi_pass_request_headers"), | |
| 176 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
| 177 ngx_conf_set_flag_slot, | |
| 178 NGX_HTTP_LOC_CONF_OFFSET, | |
| 179 offsetof(ngx_http_scgi_loc_conf_t, upstream.pass_request_headers), | |
| 180 NULL }, | |
| 181 | |
| 182 { ngx_string("scgi_pass_request_body"), | |
| 183 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
| 184 ngx_conf_set_flag_slot, | |
| 185 NGX_HTTP_LOC_CONF_OFFSET, | |
| 186 offsetof(ngx_http_scgi_loc_conf_t, upstream.pass_request_body), | |
| 187 NULL }, | |
| 188 | |
| 189 { ngx_string("scgi_intercept_errors"), | |
| 190 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
| 191 ngx_conf_set_flag_slot, | |
| 192 NGX_HTTP_LOC_CONF_OFFSET, | |
| 193 offsetof(ngx_http_scgi_loc_conf_t, upstream.intercept_errors), | |
| 194 NULL }, | |
| 195 | |
| 196 { ngx_string("scgi_read_timeout"), | |
| 197 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 198 ngx_conf_set_msec_slot, | |
| 199 NGX_HTTP_LOC_CONF_OFFSET, | |
| 200 offsetof(ngx_http_scgi_loc_conf_t, upstream.read_timeout), | |
| 201 NULL }, | |
| 202 | |
| 203 { ngx_string("scgi_buffers"), | |
| 204 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2, | |
| 205 ngx_conf_set_bufs_slot, | |
| 206 NGX_HTTP_LOC_CONF_OFFSET, | |
| 207 offsetof(ngx_http_scgi_loc_conf_t, upstream.bufs), | |
| 208 NULL }, | |
| 209 | |
| 210 { ngx_string("scgi_busy_buffers_size"), | |
| 211 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 212 ngx_conf_set_size_slot, | |
| 213 NGX_HTTP_LOC_CONF_OFFSET, | |
| 214 offsetof(ngx_http_scgi_loc_conf_t, upstream.busy_buffers_size_conf), | |
| 215 NULL }, | |
| 216 | |
|
5874
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
217 { ngx_string("scgi_force_ranges"), |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
218 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
219 ngx_conf_set_flag_slot, |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
220 NGX_HTTP_LOC_CONF_OFFSET, |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
221 offsetof(ngx_http_scgi_loc_conf_t, upstream.force_ranges), |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
222 NULL }, |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
223 |
|
5883
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
224 { ngx_string("scgi_limit_rate"), |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
225 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
226 ngx_conf_set_size_slot, |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
227 NGX_HTTP_LOC_CONF_OFFSET, |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
228 offsetof(ngx_http_scgi_loc_conf_t, upstream.limit_rate), |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
229 NULL }, |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
230 |
| 3637 | 231 #if (NGX_HTTP_CACHE) |
| 232 | |
| 233 { ngx_string("scgi_cache"), | |
| 3729 | 234 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
| 3637 | 235 ngx_http_scgi_cache, |
| 236 NGX_HTTP_LOC_CONF_OFFSET, | |
| 237 0, | |
| 238 NULL }, | |
| 239 | |
| 240 { ngx_string("scgi_cache_key"), | |
| 3729 | 241 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
| 3637 | 242 ngx_http_scgi_cache_key, |
| 243 NGX_HTTP_LOC_CONF_OFFSET, | |
| 244 0, | |
| 245 NULL }, | |
| 246 | |
| 247 { ngx_string("scgi_cache_path"), | |
| 248 NGX_HTTP_MAIN_CONF|NGX_CONF_2MORE, | |
| 249 ngx_http_file_cache_set_slot, | |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
250 NGX_HTTP_MAIN_CONF_OFFSET, |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
251 offsetof(ngx_http_scgi_main_conf_t, caches), |
| 3637 | 252 &ngx_http_scgi_module }, |
| 253 | |
|
3699
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3693
diff
changeset
|
254 { ngx_string("scgi_cache_bypass"), |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3693
diff
changeset
|
255 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3693
diff
changeset
|
256 ngx_http_set_predicate_slot, |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3693
diff
changeset
|
257 NGX_HTTP_LOC_CONF_OFFSET, |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3693
diff
changeset
|
258 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_bypass), |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3693
diff
changeset
|
259 NULL }, |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3693
diff
changeset
|
260 |
| 3637 | 261 { ngx_string("scgi_no_cache"), |
| 262 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | |
|
3692
045ea40cbfe8
use ngx_http_test_predicates(), ngx_http_set_predicate_slot()
Igor Sysoev <igor@sysoev.ru>
parents:
3670
diff
changeset
|
263 ngx_http_set_predicate_slot, |
| 3637 | 264 NGX_HTTP_LOC_CONF_OFFSET, |
| 265 offsetof(ngx_http_scgi_loc_conf_t, upstream.no_cache), | |
| 266 NULL }, | |
| 267 | |
| 268 { ngx_string("scgi_cache_valid"), | |
| 269 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | |
| 270 ngx_http_file_cache_valid_set_slot, | |
| 271 NGX_HTTP_LOC_CONF_OFFSET, | |
| 272 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_valid), | |
| 273 NULL }, | |
| 274 | |
| 275 { ngx_string("scgi_cache_min_uses"), | |
| 276 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 277 ngx_conf_set_num_slot, | |
| 278 NGX_HTTP_LOC_CONF_OFFSET, | |
| 279 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_min_uses), | |
| 280 NULL }, | |
| 281 | |
|
6793
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6785
diff
changeset
|
282 { ngx_string("scgi_cache_max_range_offset"), |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6785
diff
changeset
|
283 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6785
diff
changeset
|
284 ngx_conf_set_off_slot, |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6785
diff
changeset
|
285 NGX_HTTP_LOC_CONF_OFFSET, |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6785
diff
changeset
|
286 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_max_range_offset), |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6785
diff
changeset
|
287 NULL }, |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6785
diff
changeset
|
288 |
| 3637 | 289 { ngx_string("scgi_cache_use_stale"), |
| 290 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | |
| 291 ngx_conf_set_bitmask_slot, | |
| 292 NGX_HTTP_LOC_CONF_OFFSET, | |
| 293 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_use_stale), | |
| 294 &ngx_http_scgi_next_upstream_masks }, | |
| 295 | |
| 296 { ngx_string("scgi_cache_methods"), | |
| 297 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | |
| 298 ngx_conf_set_bitmask_slot, | |
| 299 NGX_HTTP_LOC_CONF_OFFSET, | |
| 300 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_methods), | |
| 301 &ngx_http_upstream_cache_method_mask }, | |
| 302 | |
|
4386
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
303 { ngx_string("scgi_cache_lock"), |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
304 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
305 ngx_conf_set_flag_slot, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
306 NGX_HTTP_LOC_CONF_OFFSET, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
307 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_lock), |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
308 NULL }, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
309 |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
310 { ngx_string("scgi_cache_lock_timeout"), |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
311 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
312 ngx_conf_set_msec_slot, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
313 NGX_HTTP_LOC_CONF_OFFSET, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
314 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_lock_timeout), |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
315 NULL }, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
316 |
|
5905
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
317 { ngx_string("scgi_cache_lock_age"), |
|
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
318 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
|
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
319 ngx_conf_set_msec_slot, |
|
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
320 NGX_HTTP_LOC_CONF_OFFSET, |
|
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
321 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_lock_age), |
|
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
322 NULL }, |
|
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
323 |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5393
diff
changeset
|
324 { ngx_string("scgi_cache_revalidate"), |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5393
diff
changeset
|
325 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5393
diff
changeset
|
326 ngx_conf_set_flag_slot, |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5393
diff
changeset
|
327 NGX_HTTP_LOC_CONF_OFFSET, |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5393
diff
changeset
|
328 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_revalidate), |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5393
diff
changeset
|
329 NULL }, |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5393
diff
changeset
|
330 |
|
6906
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6793
diff
changeset
|
331 { ngx_string("scgi_cache_background_update"), |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6793
diff
changeset
|
332 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6793
diff
changeset
|
333 ngx_conf_set_flag_slot, |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6793
diff
changeset
|
334 NGX_HTTP_LOC_CONF_OFFSET, |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6793
diff
changeset
|
335 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_background_update), |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6793
diff
changeset
|
336 NULL }, |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6793
diff
changeset
|
337 |
| 3637 | 338 #endif |
| 339 | |
| 340 { ngx_string("scgi_temp_path"), | |
| 341 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1234, | |
| 342 ngx_conf_set_path_slot, | |
| 343 NGX_HTTP_LOC_CONF_OFFSET, | |
| 344 offsetof(ngx_http_scgi_loc_conf_t, upstream.temp_path), | |
| 345 NULL }, | |
| 346 | |
| 347 { ngx_string("scgi_max_temp_file_size"), | |
| 348 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 349 ngx_conf_set_size_slot, | |
| 350 NGX_HTTP_LOC_CONF_OFFSET, | |
| 351 offsetof(ngx_http_scgi_loc_conf_t, upstream.max_temp_file_size_conf), | |
| 352 NULL }, | |
| 353 | |
| 354 { ngx_string("scgi_temp_file_write_size"), | |
| 355 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 356 ngx_conf_set_size_slot, | |
| 357 NGX_HTTP_LOC_CONF_OFFSET, | |
| 358 offsetof(ngx_http_scgi_loc_conf_t, upstream.temp_file_write_size_conf), | |
| 359 NULL }, | |
| 360 | |
| 361 { ngx_string("scgi_next_upstream"), | |
| 362 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | |
| 363 ngx_conf_set_bitmask_slot, | |
| 364 NGX_HTTP_LOC_CONF_OFFSET, | |
| 365 offsetof(ngx_http_scgi_loc_conf_t, upstream.next_upstream), | |
| 366 &ngx_http_scgi_next_upstream_masks }, | |
| 367 | |
|
5832
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
368 { ngx_string("scgi_next_upstream_tries"), |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
369 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
370 ngx_conf_set_num_slot, |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
371 NGX_HTTP_LOC_CONF_OFFSET, |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
372 offsetof(ngx_http_scgi_loc_conf_t, upstream.next_upstream_tries), |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
373 NULL }, |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
374 |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
375 { ngx_string("scgi_next_upstream_timeout"), |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
376 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
377 ngx_conf_set_msec_slot, |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
378 NGX_HTTP_LOC_CONF_OFFSET, |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
379 offsetof(ngx_http_scgi_loc_conf_t, upstream.next_upstream_timeout), |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
380 NULL }, |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
381 |
| 3637 | 382 { ngx_string("scgi_param"), |
|
4331
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
383 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE23, |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
384 ngx_http_upstream_param_set_slot, |
| 3637 | 385 NGX_HTTP_LOC_CONF_OFFSET, |
| 386 offsetof(ngx_http_scgi_loc_conf_t, params_source), | |
| 387 NULL }, | |
| 388 | |
| 389 { ngx_string("scgi_pass_header"), | |
| 3729 | 390 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
| 3637 | 391 ngx_conf_set_str_array_slot, |
| 392 NGX_HTTP_LOC_CONF_OFFSET, | |
| 393 offsetof(ngx_http_scgi_loc_conf_t, upstream.pass_headers), | |
| 394 NULL }, | |
| 395 | |
| 396 { ngx_string("scgi_hide_header"), | |
| 3729 | 397 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
| 3637 | 398 ngx_conf_set_str_array_slot, |
| 399 NGX_HTTP_LOC_CONF_OFFSET, | |
| 400 offsetof(ngx_http_scgi_loc_conf_t, upstream.hide_headers), | |
| 401 NULL }, | |
| 402 | |
| 403 { ngx_string("scgi_ignore_headers"), | |
| 404 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | |
| 405 ngx_conf_set_bitmask_slot, | |
| 406 NGX_HTTP_LOC_CONF_OFFSET, | |
| 407 offsetof(ngx_http_scgi_loc_conf_t, upstream.ignore_headers), | |
|
3667
12bd9e26fadb
use shared ngx_http_upstream_ignore_headers_masks[]
Igor Sysoev <igor@sysoev.ru>
parents:
3637
diff
changeset
|
408 &ngx_http_upstream_ignore_headers_masks }, |
| 3637 | 409 |
| 410 ngx_null_command | |
| 411 }; | |
| 412 | |
| 413 | |
| 414 static ngx_http_module_t ngx_http_scgi_module_ctx = { | |
| 415 NULL, /* preconfiguration */ | |
| 416 NULL, /* postconfiguration */ | |
| 417 | |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
418 ngx_http_scgi_create_main_conf, /* create main configuration */ |
| 3637 | 419 NULL, /* init main configuration */ |
| 420 | |
| 421 NULL, /* create server configuration */ | |
| 422 NULL, /* merge server configuration */ | |
| 423 | |
| 424 ngx_http_scgi_create_loc_conf, /* create location configuration */ | |
| 425 ngx_http_scgi_merge_loc_conf /* merge location configuration */ | |
| 426 }; | |
| 427 | |
| 428 | |
| 429 ngx_module_t ngx_http_scgi_module = { | |
| 430 NGX_MODULE_V1, | |
| 431 &ngx_http_scgi_module_ctx, /* module context */ | |
| 432 ngx_http_scgi_commands, /* module directives */ | |
| 433 NGX_HTTP_MODULE, /* module type */ | |
| 434 NULL, /* init master */ | |
| 435 NULL, /* init module */ | |
| 436 NULL, /* init process */ | |
| 437 NULL, /* init thread */ | |
| 438 NULL, /* exit thread */ | |
| 439 NULL, /* exit process */ | |
| 440 NULL, /* exit master */ | |
| 441 NGX_MODULE_V1_PADDING | |
| 442 }; | |
| 443 | |
| 444 | |
| 445 static ngx_str_t ngx_http_scgi_hide_headers[] = { | |
| 446 ngx_string("Status"), | |
| 447 ngx_string("X-Accel-Expires"), | |
| 448 ngx_string("X-Accel-Redirect"), | |
| 449 ngx_string("X-Accel-Limit-Rate"), | |
| 450 ngx_string("X-Accel-Buffering"), | |
| 451 ngx_string("X-Accel-Charset"), | |
| 452 ngx_null_string | |
| 453 }; | |
| 454 | |
| 455 | |
| 456 #if (NGX_HTTP_CACHE) | |
| 457 | |
| 458 static ngx_keyval_t ngx_http_scgi_cache_headers[] = { | |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5393
diff
changeset
|
459 { ngx_string("HTTP_IF_MODIFIED_SINCE"), |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5393
diff
changeset
|
460 ngx_string("$upstream_cache_last_modified") }, |
| 3637 | 461 { ngx_string("HTTP_IF_UNMODIFIED_SINCE"), ngx_string("") }, |
|
5738
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5575
diff
changeset
|
462 { ngx_string("HTTP_IF_NONE_MATCH"), ngx_string("$upstream_cache_etag") }, |
| 3637 | 463 { ngx_string("HTTP_IF_MATCH"), ngx_string("") }, |
| 464 { ngx_string("HTTP_RANGE"), ngx_string("") }, | |
| 465 { ngx_string("HTTP_IF_RANGE"), ngx_string("") }, | |
| 466 { ngx_null_string, ngx_null_string } | |
| 467 }; | |
| 468 | |
| 469 #endif | |
| 470 | |
| 471 | |
| 472 static ngx_path_init_t ngx_http_scgi_temp_path = { | |
| 473 ngx_string(NGX_HTTP_SCGI_TEMP_PATH), { 1, 2, 0 } | |
| 474 }; | |
| 475 | |
| 476 | |
| 477 static ngx_int_t | |
| 478 ngx_http_scgi_handler(ngx_http_request_t *r) | |
| 479 { | |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
480 ngx_int_t rc; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
481 ngx_http_status_t *status; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
482 ngx_http_upstream_t *u; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
483 ngx_http_scgi_loc_conf_t *scf; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
484 #if (NGX_HTTP_CACHE) |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
485 ngx_http_scgi_main_conf_t *smcf; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
486 #endif |
| 3637 | 487 |
| 488 if (ngx_http_upstream_create(r) != NGX_OK) { | |
| 489 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 490 } | |
| 491 | |
| 492 status = ngx_pcalloc(r->pool, sizeof(ngx_http_status_t)); | |
| 493 if (status == NULL) { | |
| 494 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 495 } | |
| 496 | |
| 497 ngx_http_set_ctx(r, status, ngx_http_scgi_module); | |
| 498 | |
| 499 scf = ngx_http_get_module_loc_conf(r, ngx_http_scgi_module); | |
| 500 | |
| 501 if (scf->scgi_lengths) { | |
| 502 if (ngx_http_scgi_eval(r, scf) != NGX_OK) { | |
| 503 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 504 } | |
| 505 } | |
| 506 | |
| 507 u = r->upstream; | |
| 508 | |
| 509 ngx_str_set(&u->schema, "scgi://"); | |
| 510 u->output.tag = (ngx_buf_tag_t) &ngx_http_scgi_module; | |
| 511 | |
| 512 u->conf = &scf->upstream; | |
| 513 | |
| 514 #if (NGX_HTTP_CACHE) | |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
515 smcf = ngx_http_get_module_main_conf(r, ngx_http_scgi_module); |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
516 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
517 u->caches = &smcf->caches; |
| 3637 | 518 u->create_key = ngx_http_scgi_create_key; |
| 519 #endif | |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
520 |
| 3637 | 521 u->create_request = ngx_http_scgi_create_request; |
| 522 u->reinit_request = ngx_http_scgi_reinit_request; | |
| 523 u->process_header = ngx_http_scgi_process_status_line; | |
| 524 u->abort_request = ngx_http_scgi_abort_request; | |
| 525 u->finalize_request = ngx_http_scgi_finalize_request; | |
|
4615
adcd60233817
Added r->state reset on fastcgi/scgi/uwsgi request start.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4593
diff
changeset
|
526 r->state = 0; |
| 3637 | 527 |
|
4157
9d59a8eda373
Added uwsgi_buffering and scgi_buffering directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
528 u->buffering = scf->upstream.buffering; |
| 3637 | 529 |
| 530 u->pipe = ngx_pcalloc(r->pool, sizeof(ngx_event_pipe_t)); | |
| 531 if (u->pipe == NULL) { | |
| 532 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 533 } | |
| 534 | |
| 535 u->pipe->input_filter = ngx_event_pipe_copy_input_filter; | |
| 536 u->pipe->input_ctx = r; | |
| 537 | |
|
7678
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
538 u->input_filter_init = ngx_http_scgi_input_filter_init; |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
539 u->input_filter = ngx_http_upstream_non_buffered_filter; |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
540 u->input_filter_ctx = r; |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
541 |
|
6053
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
542 if (!scf->upstream.request_buffering |
|
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
543 && scf->upstream.pass_request_body |
|
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
544 && !r->headers_in.chunked) |
|
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
545 { |
|
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
546 r->request_body_no_buffering = 1; |
|
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
547 } |
|
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
548 |
| 3637 | 549 rc = ngx_http_read_client_request_body(r, ngx_http_upstream_init); |
| 550 | |
| 551 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) { | |
| 552 return rc; | |
| 553 } | |
| 554 | |
| 555 return NGX_DONE; | |
| 556 } | |
| 557 | |
| 558 | |
| 559 static ngx_int_t | |
| 560 ngx_http_scgi_eval(ngx_http_request_t *r, ngx_http_scgi_loc_conf_t * scf) | |
| 561 { | |
| 562 ngx_url_t url; | |
| 563 ngx_http_upstream_t *u; | |
| 564 | |
| 565 ngx_memzero(&url, sizeof(ngx_url_t)); | |
| 566 | |
| 567 if (ngx_http_script_run(r, &url.url, scf->scgi_lengths->elts, 0, | |
| 568 scf->scgi_values->elts) | |
| 569 == NULL) | |
| 570 { | |
| 571 return NGX_ERROR; | |
| 572 } | |
| 573 | |
| 574 url.no_resolve = 1; | |
| 575 | |
| 576 if (ngx_parse_url(r->pool, &url) != NGX_OK) { | |
| 577 if (url.err) { | |
| 578 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 579 "%s in upstream \"%V\"", url.err, &url.url); | |
| 580 } | |
| 581 | |
| 582 return NGX_ERROR; | |
| 583 } | |
| 584 | |
| 585 u = r->upstream; | |
| 586 | |
| 587 u->resolved = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_resolved_t)); | |
| 588 if (u->resolved == NULL) { | |
| 589 return NGX_ERROR; | |
| 590 } | |
| 591 | |
|
6784
1af120241cde
Upstream: removed unnecessary condition in proxy_eval() and friends.
Ruslan Ermilov <ru@nginx.com>
parents:
6747
diff
changeset
|
592 if (url.addrs) { |
| 3637 | 593 u->resolved->sockaddr = url.addrs[0].sockaddr; |
| 594 u->resolved->socklen = url.addrs[0].socklen; | |
|
6785
d1d0dd69a419
Upstream: added the ngx_http_upstream_resolved_t.name field.
Ruslan Ermilov <ru@nginx.com>
parents:
6784
diff
changeset
|
595 u->resolved->name = url.addrs[0].name; |
| 3637 | 596 u->resolved->naddrs = 1; |
| 597 } | |
| 598 | |
|
6785
d1d0dd69a419
Upstream: added the ngx_http_upstream_resolved_t.name field.
Ruslan Ermilov <ru@nginx.com>
parents:
6784
diff
changeset
|
599 u->resolved->host = url.host; |
|
6303
a93345ee8f52
Upstream: fixed "no port" detection in evaluated upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6053
diff
changeset
|
600 u->resolved->port = url.port; |
|
a93345ee8f52
Upstream: fixed "no port" detection in evaluated upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6053
diff
changeset
|
601 u->resolved->no_port = url.no_port; |
|
a93345ee8f52
Upstream: fixed "no port" detection in evaluated upstreams.
Ruslan Ermilov <ru@nginx.com>
parents:
6053
diff
changeset
|
602 |
| 3637 | 603 return NGX_OK; |
| 604 } | |
| 605 | |
| 606 | |
| 607 #if (NGX_HTTP_CACHE) | |
| 608 | |
| 609 static ngx_int_t | |
| 610 ngx_http_scgi_create_key(ngx_http_request_t *r) | |
| 611 { | |
| 612 ngx_str_t *key; | |
| 613 ngx_http_scgi_loc_conf_t *scf; | |
| 614 | |
| 615 key = ngx_array_push(&r->cache->keys); | |
| 616 if (key == NULL) { | |
| 617 return NGX_ERROR; | |
| 618 } | |
| 619 | |
| 620 scf = ngx_http_get_module_loc_conf(r, ngx_http_scgi_module); | |
| 621 | |
| 622 if (ngx_http_complex_value(r, &scf->cache_key, key) != NGX_OK) { | |
| 623 return NGX_ERROR; | |
| 624 } | |
| 625 | |
| 626 return NGX_OK; | |
| 627 } | |
| 628 | |
| 629 #endif | |
| 630 | |
| 631 | |
| 632 static ngx_int_t | |
| 633 ngx_http_scgi_create_request(ngx_http_request_t *r) | |
| 634 { | |
|
4929
5a44d638cd27
Request body: recalculate size of a request body in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4615
diff
changeset
|
635 off_t content_length_n; |
| 3637 | 636 u_char ch, *key, *val, *lowcase_key; |
|
4331
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
637 size_t len, key_len, val_len, allocated; |
| 3637 | 638 ngx_buf_t *b; |
|
4929
5a44d638cd27
Request body: recalculate size of a request body in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4615
diff
changeset
|
639 ngx_str_t content_length; |
|
4331
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
640 ngx_uint_t i, n, hash, skip_empty, header_params; |
| 3637 | 641 ngx_chain_t *cl, *body; |
| 642 ngx_list_part_t *part; | |
| 643 ngx_table_elt_t *header, **ignored; | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
644 ngx_http_scgi_params_t *params; |
| 3637 | 645 ngx_http_script_code_pt code; |
| 646 ngx_http_script_engine_t e, le; | |
| 647 ngx_http_scgi_loc_conf_t *scf; | |
| 648 ngx_http_script_len_code_pt lcode; | |
|
4929
5a44d638cd27
Request body: recalculate size of a request body in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4615
diff
changeset
|
649 u_char buffer[NGX_OFF_T_LEN]; |
|
5a44d638cd27
Request body: recalculate size of a request body in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4615
diff
changeset
|
650 |
|
5a44d638cd27
Request body: recalculate size of a request body in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4615
diff
changeset
|
651 content_length_n = 0; |
|
5a44d638cd27
Request body: recalculate size of a request body in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4615
diff
changeset
|
652 body = r->upstream->request_bufs; |
| 3637 | 653 |
|
4929
5a44d638cd27
Request body: recalculate size of a request body in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4615
diff
changeset
|
654 while (body) { |
|
5a44d638cd27
Request body: recalculate size of a request body in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4615
diff
changeset
|
655 content_length_n += ngx_buf_size(body->buf); |
|
5a44d638cd27
Request body: recalculate size of a request body in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4615
diff
changeset
|
656 body = body->next; |
|
5a44d638cd27
Request body: recalculate size of a request body in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4615
diff
changeset
|
657 } |
| 3637 | 658 |
|
4929
5a44d638cd27
Request body: recalculate size of a request body in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4615
diff
changeset
|
659 content_length.data = buffer; |
|
5a44d638cd27
Request body: recalculate size of a request body in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4615
diff
changeset
|
660 content_length.len = ngx_sprintf(buffer, "%O", content_length_n) - buffer; |
|
5a44d638cd27
Request body: recalculate size of a request body in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4615
diff
changeset
|
661 |
|
5a44d638cd27
Request body: recalculate size of a request body in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4615
diff
changeset
|
662 len = sizeof("CONTENT_LENGTH") + content_length.len + 1; |
| 3637 | 663 |
| 664 header_params = 0; | |
| 665 ignored = NULL; | |
| 666 | |
| 667 scf = ngx_http_get_module_loc_conf(r, ngx_http_scgi_module); | |
| 668 | |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
669 #if (NGX_HTTP_CACHE) |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
670 params = r->upstream->cacheable ? &scf->params_cache : &scf->params; |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
671 #else |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
672 params = &scf->params; |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
673 #endif |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
674 |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
675 if (params->lengths) { |
| 3637 | 676 ngx_memzero(&le, sizeof(ngx_http_script_engine_t)); |
| 677 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
678 ngx_http_script_flush_no_cacheable_variables(r, params->flushes); |
| 3637 | 679 le.flushed = 1; |
| 680 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
681 le.ip = params->lengths->elts; |
| 3637 | 682 le.request = r; |
| 683 | |
| 684 while (*(uintptr_t *) le.ip) { | |
| 685 | |
| 686 lcode = *(ngx_http_script_len_code_pt *) le.ip; | |
|
4331
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
687 key_len = lcode(&le); |
| 3637 | 688 |
|
4331
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
689 lcode = *(ngx_http_script_len_code_pt *) le.ip; |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
690 skip_empty = lcode(&le); |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
691 |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
692 for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode(&le)) { |
| 3637 | 693 lcode = *(ngx_http_script_len_code_pt *) le.ip; |
| 694 } | |
|
4331
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
695 le.ip += sizeof(uintptr_t); |
|
4294
56cb2255735a
Fixed incorrect counting the length of headers in a SCGI request.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
696 |
|
4331
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
697 if (skip_empty && val_len == 0) { |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
698 continue; |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
699 } |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
700 |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
701 len += key_len + val_len + 1; |
| 3637 | 702 } |
| 703 } | |
| 704 | |
| 705 if (scf->upstream.pass_request_headers) { | |
| 706 | |
| 707 allocated = 0; | |
| 708 lowcase_key = NULL; | |
| 709 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
710 if (params->number) { |
|
4015
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
711 n = 0; |
|
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
712 part = &r->headers_in.headers.part; |
|
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
713 |
|
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
714 while (part) { |
|
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
715 n += part->nelts; |
|
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
716 part = part->next; |
|
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
717 } |
|
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
718 |
|
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
719 ignored = ngx_palloc(r->pool, n * sizeof(void *)); |
| 3637 | 720 if (ignored == NULL) { |
| 721 return NGX_ERROR; | |
| 722 } | |
| 723 } | |
| 724 | |
| 725 part = &r->headers_in.headers.part; | |
| 726 header = part->elts; | |
| 727 | |
| 728 for (i = 0; /* void */; i++) { | |
| 729 | |
| 730 if (i >= part->nelts) { | |
| 731 if (part->next == NULL) { | |
| 732 break; | |
| 733 } | |
| 734 | |
| 735 part = part->next; | |
| 736 header = part->elts; | |
| 737 i = 0; | |
| 738 } | |
| 739 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
740 if (params->number) { |
| 3637 | 741 if (allocated < header[i].key.len) { |
| 742 allocated = header[i].key.len + 16; | |
| 743 lowcase_key = ngx_pnalloc(r->pool, allocated); | |
| 744 if (lowcase_key == NULL) { | |
| 745 return NGX_ERROR; | |
| 746 } | |
| 747 } | |
| 748 | |
| 749 hash = 0; | |
| 750 | |
| 751 for (n = 0; n < header[i].key.len; n++) { | |
| 752 ch = header[i].key.data[n]; | |
| 753 | |
| 754 if (ch >= 'A' && ch <= 'Z') { | |
| 755 ch |= 0x20; | |
| 756 | |
| 757 } else if (ch == '-') { | |
| 758 ch = '_'; | |
| 759 } | |
| 760 | |
| 761 hash = ngx_hash(hash, ch); | |
| 762 lowcase_key[n] = ch; | |
| 763 } | |
| 764 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
765 if (ngx_hash_find(¶ms->hash, hash, lowcase_key, n)) { |
| 3637 | 766 ignored[header_params++] = &header[i]; |
| 767 continue; | |
| 768 } | |
| 769 } | |
| 770 | |
| 771 len += sizeof("HTTP_") - 1 + header[i].key.len + 1 | |
| 772 + header[i].value.len + 1; | |
| 773 } | |
| 774 } | |
| 775 | |
| 776 /* netstring: "length:" + packet + "," */ | |
| 777 | |
| 778 b = ngx_create_temp_buf(r->pool, NGX_SIZE_T_LEN + 1 + len + 1); | |
| 779 if (b == NULL) { | |
| 780 return NGX_ERROR; | |
| 781 } | |
| 782 | |
| 783 cl = ngx_alloc_chain_link(r->pool); | |
| 784 if (cl == NULL) { | |
| 785 return NGX_ERROR; | |
| 786 } | |
| 787 | |
| 788 cl->buf = b; | |
| 789 | |
|
4929
5a44d638cd27
Request body: recalculate size of a request body in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4615
diff
changeset
|
790 b->last = ngx_sprintf(b->last, "%ui:CONTENT_LENGTH%Z%V%Z", |
|
5a44d638cd27
Request body: recalculate size of a request body in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4615
diff
changeset
|
791 len, &content_length); |
| 3637 | 792 |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
793 if (params->lengths) { |
| 3637 | 794 ngx_memzero(&e, sizeof(ngx_http_script_engine_t)); |
| 795 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
796 e.ip = params->values->elts; |
| 3637 | 797 e.pos = b->last; |
| 798 e.request = r; | |
| 799 e.flushed = 1; | |
| 800 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
801 le.ip = params->lengths->elts; |
|
4331
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
802 |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
803 while (*(uintptr_t *) le.ip) { |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
804 |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
805 lcode = *(ngx_http_script_len_code_pt *) le.ip; |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
806 lcode(&le); /* key length */ |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
807 |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
808 lcode = *(ngx_http_script_len_code_pt *) le.ip; |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
809 skip_empty = lcode(&le); |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
810 |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
811 for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode(&le)) { |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
812 lcode = *(ngx_http_script_len_code_pt *) le.ip; |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
813 } |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
814 le.ip += sizeof(uintptr_t); |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
815 |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
816 if (skip_empty && val_len == 0) { |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
817 e.skip = 1; |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
818 |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
819 while (*(uintptr_t *) e.ip) { |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
820 code = *(ngx_http_script_code_pt *) e.ip; |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
821 code((ngx_http_script_engine_t *) &e); |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
822 } |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
823 e.ip += sizeof(uintptr_t); |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
824 |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
825 e.skip = 0; |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
826 |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
827 continue; |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
828 } |
| 3637 | 829 |
| 830 #if (NGX_DEBUG) | |
| 831 key = e.pos; | |
| 832 #endif | |
| 833 code = *(ngx_http_script_code_pt *) e.ip; | |
| 7088 | 834 code((ngx_http_script_engine_t *) &e); |
| 3637 | 835 |
| 836 #if (NGX_DEBUG) | |
| 837 val = e.pos; | |
| 838 #endif | |
| 839 while (*(uintptr_t *) e.ip) { | |
| 840 code = *(ngx_http_script_code_pt *) e.ip; | |
| 841 code((ngx_http_script_engine_t *) &e); | |
| 842 } | |
| 843 *e.pos++ = '\0'; | |
| 844 e.ip += sizeof(uintptr_t); | |
| 845 | |
| 846 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 847 "scgi param: \"%s: %s\"", key, val); | |
| 848 } | |
| 849 | |
| 850 b->last = e.pos; | |
| 851 } | |
| 852 | |
| 853 if (scf->upstream.pass_request_headers) { | |
| 854 | |
| 855 part = &r->headers_in.headers.part; | |
| 856 header = part->elts; | |
| 857 | |
| 858 for (i = 0; /* void */; i++) { | |
| 859 | |
| 860 if (i >= part->nelts) { | |
| 861 if (part->next == NULL) { | |
| 862 break; | |
| 863 } | |
| 864 | |
| 865 part = part->next; | |
| 866 header = part->elts; | |
| 867 i = 0; | |
| 868 } | |
| 869 | |
| 870 for (n = 0; n < header_params; n++) { | |
| 871 if (&header[i] == ignored[n]) { | |
| 872 goto next; | |
| 873 } | |
| 874 } | |
| 875 | |
| 876 key = b->last; | |
| 877 b->last = ngx_cpymem(key, "HTTP_", sizeof("HTTP_") - 1); | |
| 878 | |
| 879 for (n = 0; n < header[i].key.len; n++) { | |
| 880 ch = header[i].key.data[n]; | |
| 881 | |
| 882 if (ch >= 'a' && ch <= 'z') { | |
| 883 ch &= ~0x20; | |
| 884 | |
| 885 } else if (ch == '-') { | |
| 886 ch = '_'; | |
| 887 } | |
| 888 | |
| 889 *b->last++ = ch; | |
| 890 } | |
| 891 | |
| 892 *b->last++ = (u_char) 0; | |
| 893 | |
| 894 val = b->last; | |
| 895 b->last = ngx_copy(val, header[i].value.data, header[i].value.len); | |
| 896 *b->last++ = (u_char) 0; | |
| 897 | |
| 898 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 899 "scgi param: \"%s: %s\"", key, val); | |
| 900 | |
| 901 next: | |
| 902 | |
| 903 continue; | |
| 6474 | 904 } |
| 3637 | 905 } |
| 906 | |
| 907 *b->last++ = (u_char) ','; | |
| 908 | |
|
6053
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
909 if (r->request_body_no_buffering) { |
|
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
910 r->upstream->request_bufs = cl; |
|
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
911 |
|
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
912 } else if (scf->upstream.pass_request_body) { |
| 3637 | 913 body = r->upstream->request_bufs; |
| 914 r->upstream->request_bufs = cl; | |
| 915 | |
| 916 while (body) { | |
| 917 b = ngx_alloc_buf(r->pool); | |
| 918 if (b == NULL) { | |
| 919 return NGX_ERROR; | |
| 920 } | |
| 921 | |
| 922 ngx_memcpy(b, body->buf, sizeof(ngx_buf_t)); | |
| 923 | |
| 924 cl->next = ngx_alloc_chain_link(r->pool); | |
| 925 if (cl->next == NULL) { | |
| 926 return NGX_ERROR; | |
| 927 } | |
| 928 | |
| 929 cl = cl->next; | |
| 930 cl->buf = b; | |
| 931 | |
| 932 body = body->next; | |
| 933 } | |
| 934 | |
| 935 } else { | |
| 936 r->upstream->request_bufs = cl; | |
| 937 } | |
| 938 | |
| 939 cl->next = NULL; | |
| 940 | |
| 941 return NGX_OK; | |
| 942 } | |
| 943 | |
| 944 | |
| 945 static ngx_int_t | |
| 946 ngx_http_scgi_reinit_request(ngx_http_request_t *r) | |
| 947 { | |
| 948 ngx_http_status_t *status; | |
| 949 | |
| 950 status = ngx_http_get_module_ctx(r, ngx_http_scgi_module); | |
| 951 | |
| 952 if (status == NULL) { | |
| 953 return NGX_OK; | |
| 954 } | |
| 955 | |
| 956 status->code = 0; | |
| 957 status->count = 0; | |
| 958 status->start = NULL; | |
| 959 status->end = NULL; | |
| 960 | |
| 961 r->upstream->process_header = ngx_http_scgi_process_status_line; | |
|
4615
adcd60233817
Added r->state reset on fastcgi/scgi/uwsgi request start.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4593
diff
changeset
|
962 r->state = 0; |
| 3637 | 963 |
| 964 return NGX_OK; | |
| 965 } | |
| 966 | |
| 967 | |
| 968 static ngx_int_t | |
| 969 ngx_http_scgi_process_status_line(ngx_http_request_t *r) | |
| 970 { | |
| 971 size_t len; | |
| 972 ngx_int_t rc; | |
| 973 ngx_http_status_t *status; | |
| 974 ngx_http_upstream_t *u; | |
| 975 | |
| 976 status = ngx_http_get_module_ctx(r, ngx_http_scgi_module); | |
| 977 | |
| 978 if (status == NULL) { | |
| 979 return NGX_ERROR; | |
| 980 } | |
| 981 | |
| 982 u = r->upstream; | |
| 983 | |
| 984 rc = ngx_http_parse_status_line(r, &u->buffer, status); | |
| 985 | |
| 986 if (rc == NGX_AGAIN) { | |
| 987 return rc; | |
| 988 } | |
| 989 | |
| 990 if (rc == NGX_ERROR) { | |
| 991 u->process_header = ngx_http_scgi_process_header; | |
| 992 return ngx_http_scgi_process_header(r); | |
| 993 } | |
| 994 | |
|
5575
d15822784cf9
Upstream: fix $upstream_status variable.
Piotr Sikora <piotr@cloudflare.com>
parents:
5496
diff
changeset
|
995 if (u->state && u->state->status == 0) { |
| 3637 | 996 u->state->status = status->code; |
| 997 } | |
| 998 | |
| 999 u->headers_in.status_n = status->code; | |
| 1000 | |
| 1001 len = status->end - status->start; | |
| 1002 u->headers_in.status_line.len = len; | |
| 1003 | |
| 1004 u->headers_in.status_line.data = ngx_pnalloc(r->pool, len); | |
| 1005 if (u->headers_in.status_line.data == NULL) { | |
| 1006 return NGX_ERROR; | |
| 1007 } | |
| 1008 | |
| 1009 ngx_memcpy(u->headers_in.status_line.data, status->start, len); | |
| 1010 | |
| 1011 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 1012 "http scgi status %ui \"%V\"", | |
| 1013 u->headers_in.status_n, &u->headers_in.status_line); | |
| 1014 | |
| 1015 u->process_header = ngx_http_scgi_process_header; | |
| 1016 | |
| 1017 return ngx_http_scgi_process_header(r); | |
| 1018 } | |
| 1019 | |
| 1020 | |
| 1021 static ngx_int_t | |
| 1022 ngx_http_scgi_process_header(ngx_http_request_t *r) | |
| 1023 { | |
| 1024 ngx_str_t *status_line; | |
| 1025 ngx_int_t rc, status; | |
| 1026 ngx_table_elt_t *h; | |
| 1027 ngx_http_upstream_t *u; | |
| 1028 ngx_http_upstream_header_t *hh; | |
| 1029 ngx_http_upstream_main_conf_t *umcf; | |
| 1030 | |
| 1031 umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module); | |
| 1032 | |
| 1033 for ( ;; ) { | |
| 1034 | |
| 1035 rc = ngx_http_parse_header_line(r, &r->upstream->buffer, 1); | |
| 1036 | |
| 1037 if (rc == NGX_OK) { | |
| 1038 | |
| 1039 /* a header line has been parsed successfully */ | |
| 1040 | |
| 1041 h = ngx_list_push(&r->upstream->headers_in.headers); | |
| 1042 if (h == NULL) { | |
| 1043 return NGX_ERROR; | |
| 1044 } | |
| 1045 | |
| 1046 h->hash = r->header_hash; | |
| 1047 | |
| 1048 h->key.len = r->header_name_end - r->header_name_start; | |
| 1049 h->value.len = r->header_end - r->header_start; | |
| 1050 | |
| 1051 h->key.data = ngx_pnalloc(r->pool, | |
| 1052 h->key.len + 1 + h->value.len + 1 | |
| 1053 + h->key.len); | |
| 1054 if (h->key.data == NULL) { | |
|
7001
08537eab4f23
Upstream: fixed u->headers_in.headers allocation error handling.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6966
diff
changeset
|
1055 h->hash = 0; |
| 3637 | 1056 return NGX_ERROR; |
| 1057 } | |
| 1058 | |
| 1059 h->value.data = h->key.data + h->key.len + 1; | |
| 1060 h->lowcase_key = h->key.data + h->key.len + 1 + h->value.len + 1; | |
| 1061 | |
|
4529
1ebec1d15a25
Fixed incorrect ngx_cpystrn() usage in ngx_http_*_process_header().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4522
diff
changeset
|
1062 ngx_memcpy(h->key.data, r->header_name_start, h->key.len); |
|
1ebec1d15a25
Fixed incorrect ngx_cpystrn() usage in ngx_http_*_process_header().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4522
diff
changeset
|
1063 h->key.data[h->key.len] = '\0'; |
|
1ebec1d15a25
Fixed incorrect ngx_cpystrn() usage in ngx_http_*_process_header().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4522
diff
changeset
|
1064 ngx_memcpy(h->value.data, r->header_start, h->value.len); |
|
1ebec1d15a25
Fixed incorrect ngx_cpystrn() usage in ngx_http_*_process_header().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4522
diff
changeset
|
1065 h->value.data[h->value.len] = '\0'; |
| 3637 | 1066 |
| 1067 if (h->key.len == r->lowcase_index) { | |
| 1068 ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len); | |
| 1069 | |
| 1070 } else { | |
| 1071 ngx_strlow(h->lowcase_key, h->key.data, h->key.len); | |
| 1072 } | |
| 1073 | |
| 1074 hh = ngx_hash_find(&umcf->headers_in_hash, h->hash, | |
| 1075 h->lowcase_key, h->key.len); | |
| 1076 | |
| 1077 if (hh && hh->handler(r, h, hh->offset) != NGX_OK) { | |
| 1078 return NGX_ERROR; | |
| 1079 } | |
| 1080 | |
| 1081 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 1082 "http scgi header: \"%V: %V\"", &h->key, &h->value); | |
| 1083 | |
| 1084 continue; | |
| 1085 } | |
| 1086 | |
| 1087 if (rc == NGX_HTTP_PARSE_HEADER_DONE) { | |
| 1088 | |
| 1089 /* a whole header has been parsed successfully */ | |
| 1090 | |
| 1091 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 1092 "http scgi header done"); | |
| 1093 | |
|
4371
16ebad9447ee
Fixed incorrect use of r->http_version in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4331
diff
changeset
|
1094 u = r->upstream; |
|
16ebad9447ee
Fixed incorrect use of r->http_version in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4331
diff
changeset
|
1095 |
|
16ebad9447ee
Fixed incorrect use of r->http_version in scgi module.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4331
diff
changeset
|
1096 if (u->headers_in.status_n) { |
|
5078
10c74d3b15d1
Connection upgrade support in uwsgi and scgi modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
1097 goto done; |
| 3637 | 1098 } |
| 1099 | |
| 1100 if (u->headers_in.status) { | |
| 1101 status_line = &u->headers_in.status->value; | |
| 1102 | |
| 1103 status = ngx_atoi(status_line->data, 3); | |
| 1104 if (status == NGX_ERROR) { | |
| 1105 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 1106 "upstream sent invalid status \"%V\"", | |
| 1107 status_line); | |
| 1108 return NGX_HTTP_UPSTREAM_INVALID_HEADER; | |
| 1109 } | |
| 1110 | |
| 1111 u->headers_in.status_n = status; | |
| 1112 u->headers_in.status_line = *status_line; | |
| 1113 | |
| 1114 } else if (u->headers_in.location) { | |
| 1115 u->headers_in.status_n = 302; | |
| 1116 ngx_str_set(&u->headers_in.status_line, | |
| 1117 "302 Moved Temporarily"); | |
| 1118 | |
| 1119 } else { | |
| 1120 u->headers_in.status_n = 200; | |
| 1121 ngx_str_set(&u->headers_in.status_line, "200 OK"); | |
| 1122 } | |
| 1123 | |
|
5575
d15822784cf9
Upstream: fix $upstream_status variable.
Piotr Sikora <piotr@cloudflare.com>
parents:
5496
diff
changeset
|
1124 if (u->state && u->state->status == 0) { |
| 3637 | 1125 u->state->status = u->headers_in.status_n; |
| 1126 } | |
| 1127 | |
|
5078
10c74d3b15d1
Connection upgrade support in uwsgi and scgi modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
1128 done: |
|
10c74d3b15d1
Connection upgrade support in uwsgi and scgi modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
1129 |
|
10c74d3b15d1
Connection upgrade support in uwsgi and scgi modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
1130 if (u->headers_in.status_n == NGX_HTTP_SWITCHING_PROTOCOLS |
|
5080
8da37c1b22a4
Trailing whitespace fix.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5078
diff
changeset
|
1131 && r->headers_in.upgrade) |
|
5078
10c74d3b15d1
Connection upgrade support in uwsgi and scgi modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
1132 { |
|
10c74d3b15d1
Connection upgrade support in uwsgi and scgi modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
1133 u->upgrade = 1; |
|
10c74d3b15d1
Connection upgrade support in uwsgi and scgi modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
1134 } |
|
10c74d3b15d1
Connection upgrade support in uwsgi and scgi modules.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5008
diff
changeset
|
1135 |
| 3637 | 1136 return NGX_OK; |
| 1137 } | |
| 1138 | |
| 1139 if (rc == NGX_AGAIN) { | |
| 1140 return NGX_AGAIN; | |
| 1141 } | |
| 1142 | |
|
7884
b87b7092cedb
Improved logging of invalid headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7678
diff
changeset
|
1143 /* rc == NGX_HTTP_PARSE_INVALID_HEADER */ |
|
b87b7092cedb
Improved logging of invalid headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7678
diff
changeset
|
1144 |
|
7933
2f443cac3f1e
Upstream: fixed logging level of upstream invalid header errors.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7884
diff
changeset
|
1145 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
7884
b87b7092cedb
Improved logging of invalid headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7678
diff
changeset
|
1146 "upstream sent invalid header: \"%*s\\x%02xd...\"", |
|
b87b7092cedb
Improved logging of invalid headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7678
diff
changeset
|
1147 r->header_end - r->header_name_start, |
|
b87b7092cedb
Improved logging of invalid headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7678
diff
changeset
|
1148 r->header_name_start, *r->header_end); |
| 3637 | 1149 |
| 1150 return NGX_HTTP_UPSTREAM_INVALID_HEADER; | |
| 1151 } | |
| 1152 } | |
| 1153 | |
| 1154 | |
|
7678
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1155 static ngx_int_t |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1156 ngx_http_scgi_input_filter_init(void *data) |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1157 { |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1158 ngx_http_request_t *r = data; |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1159 ngx_http_upstream_t *u; |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1160 |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1161 u = r->upstream; |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1162 |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1163 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1164 "http scgi filter init s:%ui l:%O", |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1165 u->headers_in.status_n, u->headers_in.content_length_n); |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1166 |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1167 if (u->headers_in.status_n == NGX_HTTP_NO_CONTENT |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1168 || u->headers_in.status_n == NGX_HTTP_NOT_MODIFIED) |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1169 { |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1170 u->pipe->length = 0; |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1171 u->length = 0; |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1172 |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1173 } else if (r->method == NGX_HTTP_HEAD) { |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1174 u->pipe->length = -1; |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1175 u->length = -1; |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1176 |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1177 } else { |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1178 u->pipe->length = u->headers_in.content_length_n; |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1179 u->length = u->headers_in.content_length_n; |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1180 } |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1181 |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1182 return NGX_OK; |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1183 } |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1184 |
|
bffcc5af1d72
Upstream: drop extra data sent by upstream.
Maxim Dounin <mdounin@mdounin.ru>
parents:
7371
diff
changeset
|
1185 |
| 3637 | 1186 static void |
| 1187 ngx_http_scgi_abort_request(ngx_http_request_t *r) | |
| 1188 { | |
| 1189 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 1190 "abort http scgi request"); | |
| 1191 | |
| 1192 return; | |
| 1193 } | |
| 1194 | |
| 1195 | |
| 1196 static void | |
| 1197 ngx_http_scgi_finalize_request(ngx_http_request_t *r, ngx_int_t rc) | |
| 1198 { | |
| 1199 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 1200 "finalize http scgi request"); | |
| 1201 | |
| 1202 return; | |
| 1203 } | |
| 1204 | |
| 1205 | |
| 1206 static void * | |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1207 ngx_http_scgi_create_main_conf(ngx_conf_t *cf) |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1208 { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1209 ngx_http_scgi_main_conf_t *conf; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1210 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1211 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_scgi_main_conf_t)); |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1212 if (conf == NULL) { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1213 return NULL; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1214 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1215 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1216 #if (NGX_HTTP_CACHE) |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1217 if (ngx_array_init(&conf->caches, cf->pool, 4, |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1218 sizeof(ngx_http_file_cache_t *)) |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1219 != NGX_OK) |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1220 { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1221 return NULL; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1222 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1223 #endif |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1224 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1225 return conf; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1226 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1227 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1228 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1229 static void * |
| 3637 | 1230 ngx_http_scgi_create_loc_conf(ngx_conf_t *cf) |
| 1231 { | |
| 1232 ngx_http_scgi_loc_conf_t *conf; | |
| 1233 | |
| 1234 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_scgi_loc_conf_t)); | |
| 1235 if (conf == NULL) { | |
| 1236 return NULL; | |
| 1237 } | |
| 1238 | |
| 1239 conf->upstream.store = NGX_CONF_UNSET; | |
| 1240 conf->upstream.store_access = NGX_CONF_UNSET_UINT; | |
|
5832
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
1241 conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT; |
| 3637 | 1242 conf->upstream.buffering = NGX_CONF_UNSET; |
|
6053
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
1243 conf->upstream.request_buffering = NGX_CONF_UNSET; |
| 3637 | 1244 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; |
|
5874
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
1245 conf->upstream.force_ranges = NGX_CONF_UNSET; |
| 3637 | 1246 |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
4947
diff
changeset
|
1247 conf->upstream.local = NGX_CONF_UNSET_PTR; |
|
7371
8b68d50090e4
Upstream: proxy_socket_keepalive and friends.
Vladimir Homutov <vl@nginx.com>
parents:
7321
diff
changeset
|
1248 conf->upstream.socket_keepalive = NGX_CONF_UNSET; |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
4947
diff
changeset
|
1249 |
| 3637 | 1250 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; |
| 1251 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; | |
| 1252 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; | |
|
5832
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
1253 conf->upstream.next_upstream_timeout = NGX_CONF_UNSET_MSEC; |
| 3637 | 1254 |
| 1255 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE; | |
| 1256 conf->upstream.buffer_size = NGX_CONF_UNSET_SIZE; | |
|
5883
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
1257 conf->upstream.limit_rate = NGX_CONF_UNSET_SIZE; |
| 3637 | 1258 |
| 1259 conf->upstream.busy_buffers_size_conf = NGX_CONF_UNSET_SIZE; | |
| 1260 conf->upstream.max_temp_file_size_conf = NGX_CONF_UNSET_SIZE; | |
| 1261 conf->upstream.temp_file_write_size_conf = NGX_CONF_UNSET_SIZE; | |
| 1262 | |
| 1263 conf->upstream.pass_request_headers = NGX_CONF_UNSET; | |
| 1264 conf->upstream.pass_request_body = NGX_CONF_UNSET; | |
| 1265 | |
| 1266 #if (NGX_HTTP_CACHE) | |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
1267 conf->upstream.cache = NGX_CONF_UNSET; |
| 3637 | 1268 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT; |
|
6793
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6785
diff
changeset
|
1269 conf->upstream.cache_max_range_offset = NGX_CONF_UNSET; |
|
3699
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3693
diff
changeset
|
1270 conf->upstream.cache_bypass = NGX_CONF_UNSET_PTR; |
|
3693
e3bcc2f4c418
fix scgi_no_cache and uwsgi_no_cache initialization
Igor Sysoev <igor@sysoev.ru>
parents:
3692
diff
changeset
|
1271 conf->upstream.no_cache = NGX_CONF_UNSET_PTR; |
| 3637 | 1272 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR; |
|
4386
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
1273 conf->upstream.cache_lock = NGX_CONF_UNSET; |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
1274 conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC; |
|
5905
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
1275 conf->upstream.cache_lock_age = NGX_CONF_UNSET_MSEC; |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5393
diff
changeset
|
1276 conf->upstream.cache_revalidate = NGX_CONF_UNSET; |
|
6906
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6793
diff
changeset
|
1277 conf->upstream.cache_background_update = NGX_CONF_UNSET; |
| 3637 | 1278 #endif |
| 1279 | |
| 1280 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR; | |
| 1281 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR; | |
| 1282 | |
| 1283 conf->upstream.intercept_errors = NGX_CONF_UNSET; | |
| 1284 | |
| 1285 /* "scgi_cyclic_temp_file" is disabled */ | |
| 1286 conf->upstream.cyclic_temp_file = 0; | |
| 1287 | |
|
4157
9d59a8eda373
Added uwsgi_buffering and scgi_buffering directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1288 conf->upstream.change_buffering = 1; |
|
9d59a8eda373
Added uwsgi_buffering and scgi_buffering directives.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1289 |
|
3976
215fe9223419
update r3945 with more descriptive error message
Igor Sysoev <igor@sysoev.ru>
parents:
3879
diff
changeset
|
1290 ngx_str_set(&conf->upstream.module, "scgi"); |
|
215fe9223419
update r3945 with more descriptive error message
Igor Sysoev <igor@sysoev.ru>
parents:
3879
diff
changeset
|
1291 |
| 3637 | 1292 return conf; |
| 1293 } | |
| 1294 | |
| 1295 | |
| 1296 static char * | |
| 1297 ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) | |
| 1298 { | |
| 1299 ngx_http_scgi_loc_conf_t *prev = parent; | |
| 1300 ngx_http_scgi_loc_conf_t *conf = child; | |
| 1301 | |
| 1302 size_t size; | |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1303 ngx_int_t rc; |
| 3637 | 1304 ngx_hash_init_t hash; |
|
3731
72cc5b789021
inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside
Igor Sysoev <igor@sysoev.ru>
parents:
3729
diff
changeset
|
1305 ngx_http_core_loc_conf_t *clcf; |
| 3637 | 1306 |
|
5948
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
1307 #if (NGX_HTTP_CACHE) |
|
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
1308 |
|
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
1309 if (conf->upstream.store > 0) { |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
1310 conf->upstream.cache = 0; |
|
5948
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
1311 } |
|
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
1312 |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
1313 if (conf->upstream.cache > 0) { |
|
5948
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
1314 conf->upstream.store = 0; |
|
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
1315 } |
|
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
1316 |
|
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
1317 #endif |
|
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
1318 |
|
5940
e3b3b89d74e8
Upstream: fixed inheritance of proxy_store and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5938
diff
changeset
|
1319 if (conf->upstream.store == NGX_CONF_UNSET) { |
| 3637 | 1320 ngx_conf_merge_value(conf->upstream.store, prev->upstream.store, 0); |
| 1321 | |
|
5947
d9025ea1f5a5
Upstream: simplified proxy_store and friends configuration code.
Valentin Bartenev <vbart@nginx.com>
parents:
5940
diff
changeset
|
1322 conf->upstream.store_lengths = prev->upstream.store_lengths; |
|
d9025ea1f5a5
Upstream: simplified proxy_store and friends configuration code.
Valentin Bartenev <vbart@nginx.com>
parents:
5940
diff
changeset
|
1323 conf->upstream.store_values = prev->upstream.store_values; |
| 3637 | 1324 } |
| 1325 | |
| 1326 ngx_conf_merge_uint_value(conf->upstream.store_access, | |
| 1327 prev->upstream.store_access, 0600); | |
| 1328 | |
|
5832
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
1329 ngx_conf_merge_uint_value(conf->upstream.next_upstream_tries, |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
1330 prev->upstream.next_upstream_tries, 0); |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
1331 |
| 3637 | 1332 ngx_conf_merge_value(conf->upstream.buffering, |
| 1333 prev->upstream.buffering, 1); | |
| 1334 | |
|
6053
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
1335 ngx_conf_merge_value(conf->upstream.request_buffering, |
|
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
1336 prev->upstream.request_buffering, 1); |
|
b6eb6ec4fbd9
Upstream: uwsgi_request_buffering, scgi_request_buffering.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5951
diff
changeset
|
1337 |
| 3637 | 1338 ngx_conf_merge_value(conf->upstream.ignore_client_abort, |
| 1339 prev->upstream.ignore_client_abort, 0); | |
| 1340 | |
|
5874
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
1341 ngx_conf_merge_value(conf->upstream.force_ranges, |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
1342 prev->upstream.force_ranges, 0); |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
1343 |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
4947
diff
changeset
|
1344 ngx_conf_merge_ptr_value(conf->upstream.local, |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
4947
diff
changeset
|
1345 prev->upstream.local, NULL); |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
4947
diff
changeset
|
1346 |
|
7371
8b68d50090e4
Upstream: proxy_socket_keepalive and friends.
Vladimir Homutov <vl@nginx.com>
parents:
7321
diff
changeset
|
1347 ngx_conf_merge_value(conf->upstream.socket_keepalive, |
|
8b68d50090e4
Upstream: proxy_socket_keepalive and friends.
Vladimir Homutov <vl@nginx.com>
parents:
7321
diff
changeset
|
1348 prev->upstream.socket_keepalive, 0); |
|
8b68d50090e4
Upstream: proxy_socket_keepalive and friends.
Vladimir Homutov <vl@nginx.com>
parents:
7321
diff
changeset
|
1349 |
| 3637 | 1350 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, |
| 1351 prev->upstream.connect_timeout, 60000); | |
| 1352 | |
| 1353 ngx_conf_merge_msec_value(conf->upstream.send_timeout, | |
| 1354 prev->upstream.send_timeout, 60000); | |
| 1355 | |
| 1356 ngx_conf_merge_msec_value(conf->upstream.read_timeout, | |
| 1357 prev->upstream.read_timeout, 60000); | |
| 1358 | |
|
5832
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
1359 ngx_conf_merge_msec_value(conf->upstream.next_upstream_timeout, |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
1360 prev->upstream.next_upstream_timeout, 0); |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
1361 |
| 3637 | 1362 ngx_conf_merge_size_value(conf->upstream.send_lowat, |
| 1363 prev->upstream.send_lowat, 0); | |
| 1364 | |
| 1365 ngx_conf_merge_size_value(conf->upstream.buffer_size, | |
| 1366 prev->upstream.buffer_size, | |
| 1367 (size_t) ngx_pagesize); | |
| 1368 | |
|
5883
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
1369 ngx_conf_merge_size_value(conf->upstream.limit_rate, |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
1370 prev->upstream.limit_rate, 0); |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
1371 |
| 3637 | 1372 |
| 1373 ngx_conf_merge_bufs_value(conf->upstream.bufs, prev->upstream.bufs, | |
| 1374 8, ngx_pagesize); | |
| 1375 | |
| 1376 if (conf->upstream.bufs.num < 2) { | |
| 1377 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 1378 "there must be at least 2 \"scgi_buffers\""); | |
| 1379 return NGX_CONF_ERROR; | |
| 1380 } | |
| 1381 | |
| 1382 | |
| 1383 size = conf->upstream.buffer_size; | |
| 1384 if (size < conf->upstream.bufs.size) { | |
| 1385 size = conf->upstream.bufs.size; | |
| 1386 } | |
| 1387 | |
| 1388 | |
| 1389 ngx_conf_merge_size_value(conf->upstream.busy_buffers_size_conf, | |
| 1390 prev->upstream.busy_buffers_size_conf, | |
| 1391 NGX_CONF_UNSET_SIZE); | |
| 1392 | |
| 1393 if (conf->upstream.busy_buffers_size_conf == NGX_CONF_UNSET_SIZE) { | |
| 1394 conf->upstream.busy_buffers_size = 2 * size; | |
| 1395 } else { | |
| 1396 conf->upstream.busy_buffers_size = | |
| 1397 conf->upstream.busy_buffers_size_conf; | |
| 1398 } | |
| 1399 | |
| 1400 if (conf->upstream.busy_buffers_size < size) { | |
| 1401 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
|
4593
834049edae24
Fixed grammar in error messages.
Ruslan Ermilov <ru@nginx.com>
parents:
4529
diff
changeset
|
1402 "\"scgi_busy_buffers_size\" must be equal to or greater " |
|
834049edae24
Fixed grammar in error messages.
Ruslan Ermilov <ru@nginx.com>
parents:
4529
diff
changeset
|
1403 "than the maximum of the value of \"scgi_buffer_size\" and " |
| 3637 | 1404 "one of the \"scgi_buffers\""); |
| 1405 | |
| 1406 return NGX_CONF_ERROR; | |
| 1407 } | |
| 1408 | |
| 1409 if (conf->upstream.busy_buffers_size | |
| 1410 > (conf->upstream.bufs.num - 1) * conf->upstream.bufs.size) | |
| 1411 { | |
| 1412 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 1413 "\"scgi_busy_buffers_size\" must be less than " | |
| 1414 "the size of all \"scgi_buffers\" minus one buffer"); | |
| 1415 | |
| 1416 return NGX_CONF_ERROR; | |
| 1417 } | |
| 1418 | |
| 1419 | |
| 1420 ngx_conf_merge_size_value(conf->upstream.temp_file_write_size_conf, | |
| 1421 prev->upstream.temp_file_write_size_conf, | |
| 1422 NGX_CONF_UNSET_SIZE); | |
| 1423 | |
| 1424 if (conf->upstream.temp_file_write_size_conf == NGX_CONF_UNSET_SIZE) { | |
| 1425 conf->upstream.temp_file_write_size = 2 * size; | |
| 1426 } else { | |
| 1427 conf->upstream.temp_file_write_size = | |
| 1428 conf->upstream.temp_file_write_size_conf; | |
| 1429 } | |
| 1430 | |
| 1431 if (conf->upstream.temp_file_write_size < size) { | |
| 1432 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
|
4593
834049edae24
Fixed grammar in error messages.
Ruslan Ermilov <ru@nginx.com>
parents:
4529
diff
changeset
|
1433 "\"scgi_temp_file_write_size\" must be equal to or greater than " |
|
834049edae24
Fixed grammar in error messages.
Ruslan Ermilov <ru@nginx.com>
parents:
4529
diff
changeset
|
1434 "the maximum of the value of \"scgi_buffer_size\" and " |
| 3637 | 1435 "one of the \"scgi_buffers\""); |
| 1436 | |
| 1437 return NGX_CONF_ERROR; | |
| 1438 } | |
| 1439 | |
| 1440 | |
| 1441 ngx_conf_merge_size_value(conf->upstream.max_temp_file_size_conf, | |
| 1442 prev->upstream.max_temp_file_size_conf, | |
| 1443 NGX_CONF_UNSET_SIZE); | |
| 1444 | |
| 1445 if (conf->upstream.max_temp_file_size_conf == NGX_CONF_UNSET_SIZE) { | |
| 1446 conf->upstream.max_temp_file_size = 1024 * 1024 * 1024; | |
| 1447 } else { | |
| 1448 conf->upstream.max_temp_file_size = | |
| 1449 conf->upstream.max_temp_file_size_conf; | |
| 1450 } | |
| 1451 | |
| 1452 if (conf->upstream.max_temp_file_size != 0 | |
| 5828 | 1453 && conf->upstream.max_temp_file_size < size) |
| 1454 { | |
| 3637 | 1455 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 1456 "\"scgi_max_temp_file_size\" must be equal to zero to disable " | |
|
4593
834049edae24
Fixed grammar in error messages.
Ruslan Ermilov <ru@nginx.com>
parents:
4529
diff
changeset
|
1457 "temporary files usage or must be equal to or greater than " |
|
834049edae24
Fixed grammar in error messages.
Ruslan Ermilov <ru@nginx.com>
parents:
4529
diff
changeset
|
1458 "the maximum of the value of \"scgi_buffer_size\" and " |
| 3637 | 1459 "one of the \"scgi_buffers\""); |
| 1460 | |
| 1461 return NGX_CONF_ERROR; | |
| 1462 } | |
| 1463 | |
| 1464 | |
| 1465 ngx_conf_merge_bitmask_value(conf->upstream.ignore_headers, | |
| 1466 prev->upstream.ignore_headers, | |
| 1467 NGX_CONF_BITMASK_SET); | |
| 1468 | |
| 1469 | |
| 1470 ngx_conf_merge_bitmask_value(conf->upstream.next_upstream, | |
| 1471 prev->upstream.next_upstream, | |
| 1472 (NGX_CONF_BITMASK_SET | |
| 1473 |NGX_HTTP_UPSTREAM_FT_ERROR | |
| 1474 |NGX_HTTP_UPSTREAM_FT_TIMEOUT)); | |
| 1475 | |
| 1476 if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) { | |
| 1477 conf->upstream.next_upstream = NGX_CONF_BITMASK_SET | |
| 1478 |NGX_HTTP_UPSTREAM_FT_OFF; | |
| 1479 } | |
| 1480 | |
| 1481 if (ngx_conf_merge_path_value(cf, &conf->upstream.temp_path, | |
| 1482 prev->upstream.temp_path, | |
| 1483 &ngx_http_scgi_temp_path) | |
| 1484 != NGX_OK) | |
| 1485 { | |
| 1486 return NGX_CONF_ERROR; | |
| 1487 } | |
| 1488 | |
| 1489 #if (NGX_HTTP_CACHE) | |
| 1490 | |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
1491 if (conf->upstream.cache == NGX_CONF_UNSET) { |
|
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
1492 ngx_conf_merge_value(conf->upstream.cache, |
|
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
1493 prev->upstream.cache, 0); |
| 3637 | 1494 |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
1495 conf->upstream.cache_zone = prev->upstream.cache_zone; |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1496 conf->upstream.cache_value = prev->upstream.cache_value; |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
1497 } |
|
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
1498 |
|
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
1499 if (conf->upstream.cache_zone && conf->upstream.cache_zone->data == NULL) { |
| 3637 | 1500 ngx_shm_zone_t *shm_zone; |
| 1501 | |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
1502 shm_zone = conf->upstream.cache_zone; |
| 3637 | 1503 |
| 1504 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 1505 "\"scgi_cache\" zone \"%V\" is unknown", | |
| 1506 &shm_zone->shm.name); | |
| 1507 | |
| 1508 return NGX_CONF_ERROR; | |
| 1509 } | |
| 1510 | |
| 1511 ngx_conf_merge_uint_value(conf->upstream.cache_min_uses, | |
| 1512 prev->upstream.cache_min_uses, 1); | |
| 1513 | |
|
6793
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6785
diff
changeset
|
1514 ngx_conf_merge_off_value(conf->upstream.cache_max_range_offset, |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6785
diff
changeset
|
1515 prev->upstream.cache_max_range_offset, |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6785
diff
changeset
|
1516 NGX_MAX_OFF_T_VALUE); |
|
0fba3ed4e7eb
Cache: proxy_cache_max_range_offset and friends.
Dmitry Volyntsev <xeioex@nginx.com>
parents:
6785
diff
changeset
|
1517 |
| 3637 | 1518 ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale, |
| 1519 prev->upstream.cache_use_stale, | |
| 1520 (NGX_CONF_BITMASK_SET | |
| 1521 |NGX_HTTP_UPSTREAM_FT_OFF)); | |
| 1522 | |
| 1523 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) { | |
| 1524 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET | |
| 1525 |NGX_HTTP_UPSTREAM_FT_OFF; | |
| 1526 } | |
| 1527 | |
|
4401
d45742815c90
Fixed proxy_cache_use_stale in "no live upstreams" case.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4386
diff
changeset
|
1528 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_ERROR) { |
|
d45742815c90
Fixed proxy_cache_use_stale in "no live upstreams" case.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4386
diff
changeset
|
1529 conf->upstream.cache_use_stale |= NGX_HTTP_UPSTREAM_FT_NOLIVE; |
|
d45742815c90
Fixed proxy_cache_use_stale in "no live upstreams" case.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4386
diff
changeset
|
1530 } |
|
d45742815c90
Fixed proxy_cache_use_stale in "no live upstreams" case.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4386
diff
changeset
|
1531 |
| 3637 | 1532 if (conf->upstream.cache_methods == 0) { |
| 1533 conf->upstream.cache_methods = prev->upstream.cache_methods; | |
| 1534 } | |
| 1535 | |
| 1536 conf->upstream.cache_methods |= NGX_HTTP_GET|NGX_HTTP_HEAD; | |
| 1537 | |
|
3699
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3693
diff
changeset
|
1538 ngx_conf_merge_ptr_value(conf->upstream.cache_bypass, |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3693
diff
changeset
|
1539 prev->upstream.cache_bypass, NULL); |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3693
diff
changeset
|
1540 |
| 3637 | 1541 ngx_conf_merge_ptr_value(conf->upstream.no_cache, |
| 1542 prev->upstream.no_cache, NULL); | |
| 1543 | |
| 1544 ngx_conf_merge_ptr_value(conf->upstream.cache_valid, | |
| 1545 prev->upstream.cache_valid, NULL); | |
| 1546 | |
| 1547 if (conf->cache_key.value.data == NULL) { | |
| 1548 conf->cache_key = prev->cache_key; | |
| 1549 } | |
| 1550 | |
|
5829
906530c9ffd2
Added warning about unset cache keys.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5828
diff
changeset
|
1551 if (conf->upstream.cache && conf->cache_key.value.data == NULL) { |
|
906530c9ffd2
Added warning about unset cache keys.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5828
diff
changeset
|
1552 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, |
|
906530c9ffd2
Added warning about unset cache keys.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5828
diff
changeset
|
1553 "no \"scgi_cache_key\" for \"scgi_cache\""); |
|
906530c9ffd2
Added warning about unset cache keys.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5828
diff
changeset
|
1554 } |
|
906530c9ffd2
Added warning about unset cache keys.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5828
diff
changeset
|
1555 |
|
4386
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
1556 ngx_conf_merge_value(conf->upstream.cache_lock, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
1557 prev->upstream.cache_lock, 0); |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
1558 |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
1559 ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
1560 prev->upstream.cache_lock_timeout, 5000); |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4373
diff
changeset
|
1561 |
|
5905
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
1562 ngx_conf_merge_msec_value(conf->upstream.cache_lock_age, |
|
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
1563 prev->upstream.cache_lock_age, 5000); |
|
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
1564 |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5393
diff
changeset
|
1565 ngx_conf_merge_value(conf->upstream.cache_revalidate, |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5393
diff
changeset
|
1566 prev->upstream.cache_revalidate, 0); |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5393
diff
changeset
|
1567 |
|
6906
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6793
diff
changeset
|
1568 ngx_conf_merge_value(conf->upstream.cache_background_update, |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6793
diff
changeset
|
1569 prev->upstream.cache_background_update, 0); |
|
1aeaae6e9446
Upstream: proxy_cache_background_update and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
6793
diff
changeset
|
1570 |
| 3637 | 1571 #endif |
| 1572 | |
| 1573 ngx_conf_merge_value(conf->upstream.pass_request_headers, | |
| 1574 prev->upstream.pass_request_headers, 1); | |
| 1575 ngx_conf_merge_value(conf->upstream.pass_request_body, | |
| 1576 prev->upstream.pass_request_body, 1); | |
| 1577 | |
| 1578 ngx_conf_merge_value(conf->upstream.intercept_errors, | |
| 1579 prev->upstream.intercept_errors, 0); | |
| 1580 | |
| 1581 hash.max_size = 512; | |
| 1582 hash.bucket_size = ngx_align(64, ngx_cacheline_size); | |
| 1583 hash.name = "scgi_hide_headers_hash"; | |
| 1584 | |
| 1585 if (ngx_http_upstream_hide_headers_hash(cf, &conf->upstream, | |
|
3670
2728c4e4a9ae
do not use a cache headers set to hide
Igor Sysoev <igor@sysoev.ru>
parents:
3668
diff
changeset
|
1586 &prev->upstream, ngx_http_scgi_hide_headers, &hash) |
| 3637 | 1587 != NGX_OK) |
| 1588 { | |
| 1589 return NGX_CONF_ERROR; | |
| 1590 } | |
| 1591 | |
|
5938
cd2abf7e7740
Upstream: fixed unexpected inheritance into limit_except blocks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5937
diff
changeset
|
1592 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); |
|
cd2abf7e7740
Upstream: fixed unexpected inheritance into limit_except blocks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5937
diff
changeset
|
1593 |
|
cd2abf7e7740
Upstream: fixed unexpected inheritance into limit_except blocks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5937
diff
changeset
|
1594 if (clcf->noname |
|
cd2abf7e7740
Upstream: fixed unexpected inheritance into limit_except blocks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5937
diff
changeset
|
1595 && conf->upstream.upstream == NULL && conf->scgi_lengths == NULL) |
|
cd2abf7e7740
Upstream: fixed unexpected inheritance into limit_except blocks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5937
diff
changeset
|
1596 { |
| 3637 | 1597 conf->upstream.upstream = prev->upstream.upstream; |
| 1598 conf->scgi_lengths = prev->scgi_lengths; | |
| 1599 conf->scgi_values = prev->scgi_values; | |
| 1600 } | |
| 1601 | |
|
5938
cd2abf7e7740
Upstream: fixed unexpected inheritance into limit_except blocks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5937
diff
changeset
|
1602 if (clcf->lmt_excpt && clcf->handler == NULL |
|
cd2abf7e7740
Upstream: fixed unexpected inheritance into limit_except blocks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5937
diff
changeset
|
1603 && (conf->upstream.upstream || conf->scgi_lengths)) |
|
cd2abf7e7740
Upstream: fixed unexpected inheritance into limit_except blocks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5937
diff
changeset
|
1604 { |
|
cd2abf7e7740
Upstream: fixed unexpected inheritance into limit_except blocks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5937
diff
changeset
|
1605 clcf->handler = ngx_http_scgi_handler; |
|
3731
72cc5b789021
inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside
Igor Sysoev <igor@sysoev.ru>
parents:
3729
diff
changeset
|
1606 } |
|
72cc5b789021
inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside
Igor Sysoev <igor@sysoev.ru>
parents:
3729
diff
changeset
|
1607 |
|
5907
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5906
diff
changeset
|
1608 if (conf->params_source == NULL) { |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1609 conf->params = prev->params; |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1610 #if (NGX_HTTP_CACHE) |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1611 conf->params_cache = prev->params_cache; |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1612 #endif |
|
5907
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5906
diff
changeset
|
1613 conf->params_source = prev->params_source; |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1614 } |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1615 |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1616 rc = ngx_http_scgi_init_params(cf, conf, &conf->params, NULL); |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1617 if (rc != NGX_OK) { |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1618 return NGX_CONF_ERROR; |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1619 } |
|
5907
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5906
diff
changeset
|
1620 |
|
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5906
diff
changeset
|
1621 #if (NGX_HTTP_CACHE) |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1622 |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1623 if (conf->upstream.cache) { |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1624 rc = ngx_http_scgi_init_params(cf, conf, &conf->params_cache, |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1625 ngx_http_scgi_cache_headers); |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1626 if (rc != NGX_OK) { |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1627 return NGX_CONF_ERROR; |
|
5907
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5906
diff
changeset
|
1628 } |
|
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5906
diff
changeset
|
1629 } |
|
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5906
diff
changeset
|
1630 |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1631 #endif |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1632 |
|
6747
20eb4587225b
Upstream: handling of proxy_set_header at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6530
diff
changeset
|
1633 /* |
|
20eb4587225b
Upstream: handling of proxy_set_header at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6530
diff
changeset
|
1634 * special handling to preserve conf->params in the "http" section |
|
20eb4587225b
Upstream: handling of proxy_set_header at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6530
diff
changeset
|
1635 * to inherit it to all servers |
|
20eb4587225b
Upstream: handling of proxy_set_header at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6530
diff
changeset
|
1636 */ |
|
20eb4587225b
Upstream: handling of proxy_set_header at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6530
diff
changeset
|
1637 |
|
20eb4587225b
Upstream: handling of proxy_set_header at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6530
diff
changeset
|
1638 if (prev->params.hash.buckets == NULL |
|
20eb4587225b
Upstream: handling of proxy_set_header at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6530
diff
changeset
|
1639 && conf->params_source == prev->params_source) |
|
20eb4587225b
Upstream: handling of proxy_set_header at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6530
diff
changeset
|
1640 { |
|
20eb4587225b
Upstream: handling of proxy_set_header at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6530
diff
changeset
|
1641 prev->params = conf->params; |
|
20eb4587225b
Upstream: handling of proxy_set_header at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6530
diff
changeset
|
1642 #if (NGX_HTTP_CACHE) |
|
20eb4587225b
Upstream: handling of proxy_set_header at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6530
diff
changeset
|
1643 prev->params_cache = conf->params_cache; |
|
20eb4587225b
Upstream: handling of proxy_set_header at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6530
diff
changeset
|
1644 #endif |
|
20eb4587225b
Upstream: handling of proxy_set_header at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6530
diff
changeset
|
1645 } |
|
20eb4587225b
Upstream: handling of proxy_set_header at http level.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6530
diff
changeset
|
1646 |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1647 return NGX_CONF_OK; |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1648 } |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1649 |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1650 |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1651 static ngx_int_t |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1652 ngx_http_scgi_init_params(ngx_conf_t *cf, ngx_http_scgi_loc_conf_t *conf, |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1653 ngx_http_scgi_params_t *params, ngx_keyval_t *default_params) |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1654 { |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1655 u_char *p; |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1656 size_t size; |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1657 uintptr_t *code; |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1658 ngx_uint_t i, nsrc; |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1659 ngx_array_t headers_names, params_merged; |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1660 ngx_keyval_t *h; |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1661 ngx_hash_key_t *hk; |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1662 ngx_hash_init_t hash; |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1663 ngx_http_upstream_param_t *src, *s; |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1664 ngx_http_script_compile_t sc; |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1665 ngx_http_script_copy_code_t *copy; |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1666 |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1667 if (params->hash.buckets) { |
|
5907
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5906
diff
changeset
|
1668 return NGX_OK; |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1669 } |
| 3637 | 1670 |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1671 if (conf->params_source == NULL && default_params == NULL) { |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1672 params->hash.buckets = (void *) 1; |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1673 return NGX_OK; |
| 3637 | 1674 } |
| 1675 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1676 params->lengths = ngx_array_create(cf->pool, 64, 1); |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1677 if (params->lengths == NULL) { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1678 return NGX_ERROR; |
| 3637 | 1679 } |
| 1680 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1681 params->values = ngx_array_create(cf->pool, 512, 1); |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1682 if (params->values == NULL) { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1683 return NGX_ERROR; |
| 3637 | 1684 } |
| 1685 | |
| 1686 if (ngx_array_init(&headers_names, cf->temp_pool, 4, sizeof(ngx_hash_key_t)) | |
| 1687 != NGX_OK) | |
| 1688 { | |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1689 return NGX_ERROR; |
| 3637 | 1690 } |
| 1691 | |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1692 if (conf->params_source) { |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1693 src = conf->params_source->elts; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1694 nsrc = conf->params_source->nelts; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1695 |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1696 } else { |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1697 src = NULL; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1698 nsrc = 0; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1699 } |
| 3637 | 1700 |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1701 if (default_params) { |
|
4331
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
1702 if (ngx_array_init(¶ms_merged, cf->temp_pool, 4, |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
1703 sizeof(ngx_http_upstream_param_t)) |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1704 != NGX_OK) |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1705 { |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1706 return NGX_ERROR; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1707 } |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1708 |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1709 for (i = 0; i < nsrc; i++) { |
| 3637 | 1710 |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1711 s = ngx_array_push(¶ms_merged); |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1712 if (s == NULL) { |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1713 return NGX_ERROR; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1714 } |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1715 |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1716 *s = src[i]; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1717 } |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1718 |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
1719 h = default_params; |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1720 |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1721 while (h->key.len) { |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1722 |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1723 src = params_merged.elts; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1724 nsrc = params_merged.nelts; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1725 |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1726 for (i = 0; i < nsrc; i++) { |
| 3637 | 1727 if (ngx_strcasecmp(h->key.data, src[i].key.data) == 0) { |
| 1728 goto next; | |
| 1729 } | |
| 1730 } | |
| 1731 | |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1732 s = ngx_array_push(¶ms_merged); |
| 3637 | 1733 if (s == NULL) { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1734 return NGX_ERROR; |
| 3637 | 1735 } |
| 1736 | |
|
4331
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
1737 s->key = h->key; |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
1738 s->value = h->value; |
|
5451
e68af4e3396f
Upstream: skip empty cache headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5441
diff
changeset
|
1739 s->skip_empty = 1; |
| 3637 | 1740 |
| 1741 next: | |
| 1742 | |
| 1743 h++; | |
| 1744 } | |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1745 |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1746 src = params_merged.elts; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1747 nsrc = params_merged.nelts; |
| 3637 | 1748 } |
| 1749 | |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
1750 for (i = 0; i < nsrc; i++) { |
| 3637 | 1751 |
| 1752 if (src[i].key.len > sizeof("HTTP_") - 1 | |
| 1753 && ngx_strncmp(src[i].key.data, "HTTP_", sizeof("HTTP_") - 1) == 0) | |
| 1754 { | |
| 1755 hk = ngx_array_push(&headers_names); | |
| 1756 if (hk == NULL) { | |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1757 return NGX_ERROR; |
| 3637 | 1758 } |
| 1759 | |
| 1760 hk->key.len = src[i].key.len - 5; | |
| 1761 hk->key.data = src[i].key.data + 5; | |
| 1762 hk->key_hash = ngx_hash_key_lc(hk->key.data, hk->key.len); | |
| 1763 hk->value = (void *) 1; | |
| 1764 | |
| 1765 if (src[i].value.len == 0) { | |
| 1766 continue; | |
| 1767 } | |
| 1768 } | |
| 1769 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1770 copy = ngx_array_push_n(params->lengths, |
| 3637 | 1771 sizeof(ngx_http_script_copy_code_t)); |
| 1772 if (copy == NULL) { | |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1773 return NGX_ERROR; |
| 3637 | 1774 } |
| 1775 | |
|
7271
9e25a5380a21
Silenced -Wcast-function-type warnings (closes #1546).
Sergey Kandaurov <pluknet@nginx.com>
parents:
7088
diff
changeset
|
1776 copy->code = (ngx_http_script_code_pt) (void *) |
|
9e25a5380a21
Silenced -Wcast-function-type warnings (closes #1546).
Sergey Kandaurov <pluknet@nginx.com>
parents:
7088
diff
changeset
|
1777 ngx_http_script_copy_len_code; |
| 3637 | 1778 copy->len = src[i].key.len + 1; |
| 1779 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1780 copy = ngx_array_push_n(params->lengths, |
|
4331
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
1781 sizeof(ngx_http_script_copy_code_t)); |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
1782 if (copy == NULL) { |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
1783 return NGX_ERROR; |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
1784 } |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
1785 |
|
7271
9e25a5380a21
Silenced -Wcast-function-type warnings (closes #1546).
Sergey Kandaurov <pluknet@nginx.com>
parents:
7088
diff
changeset
|
1786 copy->code = (ngx_http_script_code_pt) (void *) |
|
9e25a5380a21
Silenced -Wcast-function-type warnings (closes #1546).
Sergey Kandaurov <pluknet@nginx.com>
parents:
7088
diff
changeset
|
1787 ngx_http_script_copy_len_code; |
|
4331
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
1788 copy->len = src[i].skip_empty; |
|
059260de158d
SCGI: added "if_not_empty" flag support to the "scgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4294
diff
changeset
|
1789 |
| 3637 | 1790 |
| 1791 size = (sizeof(ngx_http_script_copy_code_t) | |
| 1792 + src[i].key.len + 1 + sizeof(uintptr_t) - 1) | |
| 1793 & ~(sizeof(uintptr_t) - 1); | |
| 1794 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1795 copy = ngx_array_push_n(params->values, size); |
| 3637 | 1796 if (copy == NULL) { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1797 return NGX_ERROR; |
| 3637 | 1798 } |
| 1799 | |
| 1800 copy->code = ngx_http_script_copy_code; | |
| 1801 copy->len = src[i].key.len + 1; | |
| 1802 | |
| 1803 p = (u_char *) copy + sizeof(ngx_http_script_copy_code_t); | |
| 1804 (void) ngx_cpystrn(p, src[i].key.data, src[i].key.len + 1); | |
| 1805 | |
| 1806 | |
| 1807 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t)); | |
| 1808 | |
| 1809 sc.cf = cf; | |
| 1810 sc.source = &src[i].value; | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1811 sc.flushes = ¶ms->flushes; |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1812 sc.lengths = ¶ms->lengths; |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1813 sc.values = ¶ms->values; |
| 3637 | 1814 |
| 1815 if (ngx_http_script_compile(&sc) != NGX_OK) { | |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1816 return NGX_ERROR; |
| 3637 | 1817 } |
| 1818 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1819 code = ngx_array_push_n(params->lengths, sizeof(uintptr_t)); |
| 3637 | 1820 if (code == NULL) { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1821 return NGX_ERROR; |
| 3637 | 1822 } |
| 1823 | |
| 1824 *code = (uintptr_t) NULL; | |
| 1825 | |
| 1826 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1827 code = ngx_array_push_n(params->values, sizeof(uintptr_t)); |
| 3637 | 1828 if (code == NULL) { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1829 return NGX_ERROR; |
| 3637 | 1830 } |
| 1831 | |
| 1832 *code = (uintptr_t) NULL; | |
| 1833 } | |
| 1834 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1835 code = ngx_array_push_n(params->lengths, sizeof(uintptr_t)); |
| 3637 | 1836 if (code == NULL) { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1837 return NGX_ERROR; |
| 3637 | 1838 } |
| 1839 | |
| 1840 *code = (uintptr_t) NULL; | |
| 1841 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1842 params->number = headers_names.nelts; |
| 3637 | 1843 |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
1844 hash.hash = ¶ms->hash; |
| 3637 | 1845 hash.key = ngx_hash_key_lc; |
| 1846 hash.max_size = 512; | |
| 1847 hash.bucket_size = 64; | |
| 1848 hash.name = "scgi_params_hash"; | |
| 1849 hash.pool = cf->pool; | |
| 1850 hash.temp_pool = NULL; | |
| 1851 | |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4157
diff
changeset
|
1852 return ngx_hash_init(&hash, headers_names.elts, headers_names.nelts); |
| 3637 | 1853 } |
| 1854 | |
| 1855 | |
| 1856 static char * | |
| 1857 ngx_http_scgi_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 1858 { | |
| 1859 ngx_http_scgi_loc_conf_t *scf = conf; | |
| 1860 | |
| 1861 ngx_url_t u; | |
| 1862 ngx_str_t *value, *url; | |
| 1863 ngx_uint_t n; | |
| 1864 ngx_http_core_loc_conf_t *clcf; | |
| 1865 ngx_http_script_compile_t sc; | |
| 1866 | |
| 1867 if (scf->upstream.upstream || scf->scgi_lengths) { | |
| 1868 return "is duplicate"; | |
| 1869 } | |
| 1870 | |
|
5758
f3df4e420ae7
Style: remove whitespace between function name and parentheses.
Piotr Sikora <piotr@cloudflare.com>
parents:
5738
diff
changeset
|
1871 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); |
| 3637 | 1872 clcf->handler = ngx_http_scgi_handler; |
| 1873 | |
| 1874 value = cf->args->elts; | |
| 1875 | |
| 1876 url = &value[1]; | |
| 1877 | |
| 1878 n = ngx_http_script_variables_count(url); | |
| 1879 | |
| 1880 if (n) { | |
| 1881 | |
| 1882 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t)); | |
| 1883 | |
| 1884 sc.cf = cf; | |
| 1885 sc.source = url; | |
| 1886 sc.lengths = &scf->scgi_lengths; | |
| 1887 sc.values = &scf->scgi_values; | |
| 1888 sc.variables = n; | |
| 1889 sc.complete_lengths = 1; | |
| 1890 sc.complete_values = 1; | |
| 1891 | |
| 1892 if (ngx_http_script_compile(&sc) != NGX_OK) { | |
| 1893 return NGX_CONF_ERROR; | |
| 1894 } | |
| 1895 | |
| 1896 return NGX_CONF_OK; | |
| 1897 } | |
| 1898 | |
| 1899 ngx_memzero(&u, sizeof(ngx_url_t)); | |
| 1900 | |
| 1901 u.url = value[1]; | |
| 1902 u.no_resolve = 1; | |
| 1903 | |
| 1904 scf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0); | |
| 1905 if (scf->upstream.upstream == NULL) { | |
| 1906 return NGX_CONF_ERROR; | |
| 1907 } | |
| 1908 | |
|
7321
45e513c3540d
Fixed invalid access to location defined as an empty string.
Ruslan Ermilov <ru@nginx.com>
parents:
7271
diff
changeset
|
1909 if (clcf->name.len && clcf->name.data[clcf->name.len - 1] == '/') { |
| 3637 | 1910 clcf->auto_redirect = 1; |
| 1911 } | |
| 1912 | |
| 1913 return NGX_CONF_OK; | |
| 1914 } | |
| 1915 | |
| 1916 | |
| 1917 static char * | |
| 1918 ngx_http_scgi_store(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 1919 { | |
| 1920 ngx_http_scgi_loc_conf_t *scf = conf; | |
| 1921 | |
| 1922 ngx_str_t *value; | |
| 1923 ngx_http_script_compile_t sc; | |
| 1924 | |
|
5947
d9025ea1f5a5
Upstream: simplified proxy_store and friends configuration code.
Valentin Bartenev <vbart@nginx.com>
parents:
5940
diff
changeset
|
1925 if (scf->upstream.store != NGX_CONF_UNSET) { |
| 3637 | 1926 return "is duplicate"; |
| 1927 } | |
| 1928 | |
| 1929 value = cf->args->elts; | |
| 1930 | |
| 1931 if (ngx_strcmp(value[1].data, "off") == 0) { | |
| 1932 scf->upstream.store = 0; | |
| 1933 return NGX_CONF_OK; | |
| 1934 } | |
| 1935 | |
| 1936 #if (NGX_HTTP_CACHE) | |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
1937 if (scf->upstream.cache > 0) { |
| 3637 | 1938 return "is incompatible with \"scgi_cache\""; |
| 1939 } | |
| 1940 #endif | |
| 1941 | |
|
5947
d9025ea1f5a5
Upstream: simplified proxy_store and friends configuration code.
Valentin Bartenev <vbart@nginx.com>
parents:
5940
diff
changeset
|
1942 scf->upstream.store = 1; |
|
d9025ea1f5a5
Upstream: simplified proxy_store and friends configuration code.
Valentin Bartenev <vbart@nginx.com>
parents:
5940
diff
changeset
|
1943 |
| 3637 | 1944 if (ngx_strcmp(value[1].data, "on") == 0) { |
| 1945 return NGX_CONF_OK; | |
| 1946 } | |
| 1947 | |
| 1948 /* include the terminating '\0' into script */ | |
| 1949 value[1].len++; | |
| 1950 | |
| 1951 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t)); | |
| 1952 | |
| 1953 sc.cf = cf; | |
| 1954 sc.source = &value[1]; | |
| 1955 sc.lengths = &scf->upstream.store_lengths; | |
| 1956 sc.values = &scf->upstream.store_values; | |
|
5496
9d056f10fb99
Style: removed surplus semicolons.
Valentin Bartenev <vbart@nginx.com>
parents:
5451
diff
changeset
|
1957 sc.variables = ngx_http_script_variables_count(&value[1]); |
| 3637 | 1958 sc.complete_lengths = 1; |
| 1959 sc.complete_values = 1; | |
| 1960 | |
| 1961 if (ngx_http_script_compile(&sc) != NGX_OK) { | |
| 1962 return NGX_CONF_ERROR; | |
| 1963 } | |
| 1964 | |
| 1965 return NGX_CONF_OK; | |
| 1966 } | |
| 1967 | |
| 1968 | |
| 1969 #if (NGX_HTTP_CACHE) | |
| 1970 | |
| 1971 static char * | |
| 1972 ngx_http_scgi_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 1973 { | |
| 1974 ngx_http_scgi_loc_conf_t *scf = conf; | |
| 1975 | |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1976 ngx_str_t *value; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1977 ngx_http_complex_value_t cv; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1978 ngx_http_compile_complex_value_t ccv; |
| 3637 | 1979 |
| 1980 value = cf->args->elts; | |
| 1981 | |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
1982 if (scf->upstream.cache != NGX_CONF_UNSET) { |
| 3637 | 1983 return "is duplicate"; |
| 1984 } | |
| 1985 | |
| 1986 if (ngx_strcmp(value[1].data, "off") == 0) { | |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
1987 scf->upstream.cache = 0; |
| 3637 | 1988 return NGX_CONF_OK; |
| 1989 } | |
| 1990 | |
|
5947
d9025ea1f5a5
Upstream: simplified proxy_store and friends configuration code.
Valentin Bartenev <vbart@nginx.com>
parents:
5940
diff
changeset
|
1991 if (scf->upstream.store > 0) { |
| 3637 | 1992 return "is incompatible with \"scgi_store\""; |
| 1993 } | |
| 1994 | |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
1995 scf->upstream.cache = 1; |
|
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
1996 |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1997 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1998 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
1999 ccv.cf = cf; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2000 ccv.value = &value[1]; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2001 ccv.complex_value = &cv; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2002 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2003 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2004 return NGX_CONF_ERROR; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2005 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2006 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2007 if (cv.lengths != NULL) { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2008 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2009 scf->upstream.cache_value = ngx_palloc(cf->pool, |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2010 sizeof(ngx_http_complex_value_t)); |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2011 if (scf->upstream.cache_value == NULL) { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2012 return NGX_CONF_ERROR; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2013 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2014 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2015 *scf->upstream.cache_value = cv; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2016 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2017 return NGX_CONF_OK; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2018 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2019 |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
2020 scf->upstream.cache_zone = ngx_shared_memory_add(cf, &value[1], 0, |
|
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
2021 &ngx_http_scgi_module); |
|
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
2022 if (scf->upstream.cache_zone == NULL) { |
| 3637 | 2023 return NGX_CONF_ERROR; |
| 2024 } | |
| 2025 | |
| 2026 return NGX_CONF_OK; | |
| 2027 } | |
| 2028 | |
| 2029 | |
| 2030 static char * | |
| 2031 ngx_http_scgi_cache_key(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 2032 { | |
| 2033 ngx_http_scgi_loc_conf_t *scf = conf; | |
| 2034 | |
| 2035 ngx_str_t *value; | |
| 2036 ngx_http_compile_complex_value_t ccv; | |
| 2037 | |
| 2038 value = cf->args->elts; | |
| 2039 | |
|
4947
4251e72b8bb4
Allow the complex value to be defined as an empty string.
Ruslan Ermilov <ru@nginx.com>
parents:
4929
diff
changeset
|
2040 if (scf->cache_key.value.data) { |
| 3637 | 2041 return "is duplicate"; |
| 2042 } | |
| 2043 | |
| 2044 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); | |
| 2045 | |
| 2046 ccv.cf = cf; | |
| 2047 ccv.value = &value[1]; | |
| 2048 ccv.complex_value = &scf->cache_key; | |
| 2049 | |
| 2050 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) { | |
| 2051 return NGX_CONF_ERROR; | |
| 2052 } | |
| 2053 | |
| 2054 return NGX_CONF_OK; | |
| 2055 } | |
| 2056 | |
| 2057 #endif |