Mercurial > hg > nginx
annotate src/http/modules/ngx_http_fastcgi_module.c @ 5951:610832763648
Upstream: added variables support to proxy_cache and friends.
| author | Valentin Bartenev <vbart@nginx.com> |
|---|---|
| date | Mon, 22 Dec 2014 12:59:09 +0300 |
| parents | 634da79665d3 |
| children | 8ad78808a612 |
| rev | line source |
|---|---|
| 479 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4412 | 4 * Copyright (C) Nginx, Inc. |
| 479 | 5 */ |
| 6 | |
| 7 | |
| 8 #include <ngx_config.h> | |
| 9 #include <ngx_core.h> | |
| 10 #include <ngx_http.h> | |
| 11 | |
| 12 | |
| 13 typedef struct { | |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
14 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
|
15 } ngx_http_fastcgi_main_conf_t; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
16 |
|
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 typedef struct { |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
19 ngx_array_t *flushes; |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
20 ngx_array_t *lengths; |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
21 ngx_array_t *values; |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
22 ngx_uint_t number; |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
23 ngx_hash_t hash; |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
24 } ngx_http_fastcgi_params_t; |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
25 |
|
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 typedef struct { |
| 651 | 28 ngx_http_upstream_conf_t upstream; |
| 29 | |
| 30 ngx_str_t index; | |
| 31 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
32 ngx_http_fastcgi_params_t params; |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
33 #if (NGX_HTTP_CACHE) |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
34 ngx_http_fastcgi_params_t params_cache; |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
35 #endif |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
36 |
| 651 | 37 ngx_array_t *params_source; |
| 1228 | 38 ngx_array_t *catch_stderr; |
|
2390
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
39 |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
40 ngx_array_t *fastcgi_lengths; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
41 ngx_array_t *fastcgi_values; |
| 2443 | 42 |
|
4122
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
43 ngx_flag_t keep_conn; |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
44 |
| 2602 | 45 #if (NGX_HTTP_CACHE) |
| 46 ngx_http_complex_value_t cache_key; | |
| 47 #endif | |
| 48 | |
| 2443 | 49 #if (NGX_PCRE) |
| 50 ngx_regex_t *split_regex; | |
| 51 ngx_str_t split_name; | |
| 52 #endif | |
| 479 | 53 } ngx_http_fastcgi_loc_conf_t; |
| 54 | |
| 55 | |
| 56 typedef enum { | |
| 57 ngx_http_fastcgi_st_version = 0, | |
| 58 ngx_http_fastcgi_st_type, | |
| 59 ngx_http_fastcgi_st_request_id_hi, | |
| 60 ngx_http_fastcgi_st_request_id_lo, | |
| 61 ngx_http_fastcgi_st_content_length_hi, | |
| 62 ngx_http_fastcgi_st_content_length_lo, | |
| 63 ngx_http_fastcgi_st_padding_length, | |
| 64 ngx_http_fastcgi_st_reserved, | |
| 65 ngx_http_fastcgi_st_data, | |
| 515 | 66 ngx_http_fastcgi_st_padding |
| 479 | 67 } ngx_http_fastcgi_state_e; |
| 68 | |
| 69 | |
| 70 typedef struct { | |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
71 u_char *start; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
72 u_char *end; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
73 } ngx_http_fastcgi_split_part_t; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
74 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
75 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
76 typedef struct { |
| 651 | 77 ngx_http_fastcgi_state_e state; |
| 78 u_char *pos; | |
| 79 u_char *last; | |
| 80 ngx_uint_t type; | |
| 81 size_t length; | |
| 82 size_t padding; | |
| 83 | |
|
3460
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
84 unsigned fastcgi_stdout:1; |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
85 unsigned large_stderr:1; |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
86 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
87 ngx_array_t *split_parts; |
| 2443 | 88 |
| 89 ngx_str_t script_name; | |
| 90 ngx_str_t path_info; | |
| 479 | 91 } ngx_http_fastcgi_ctx_t; |
| 92 | |
| 93 | |
| 94 #define NGX_HTTP_FASTCGI_RESPONDER 1 | |
| 95 | |
|
4122
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
96 #define NGX_HTTP_FASTCGI_KEEP_CONN 1 |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
97 |
| 479 | 98 #define NGX_HTTP_FASTCGI_BEGIN_REQUEST 1 |
| 99 #define NGX_HTTP_FASTCGI_ABORT_REQUEST 2 | |
| 100 #define NGX_HTTP_FASTCGI_END_REQUEST 3 | |
| 101 #define NGX_HTTP_FASTCGI_PARAMS 4 | |
| 102 #define NGX_HTTP_FASTCGI_STDIN 5 | |
| 103 #define NGX_HTTP_FASTCGI_STDOUT 6 | |
| 104 #define NGX_HTTP_FASTCGI_STDERR 7 | |
| 105 #define NGX_HTTP_FASTCGI_DATA 8 | |
| 106 | |
| 107 | |
| 108 typedef struct { | |
| 109 u_char version; | |
| 110 u_char type; | |
| 111 u_char request_id_hi; | |
| 112 u_char request_id_lo; | |
| 113 u_char content_length_hi; | |
| 114 u_char content_length_lo; | |
| 115 u_char padding_length; | |
| 116 u_char reserved; | |
| 117 } ngx_http_fastcgi_header_t; | |
| 118 | |
| 119 | |
| 120 typedef struct { | |
| 121 u_char role_hi; | |
| 122 u_char role_lo; | |
| 123 u_char flags; | |
| 124 u_char reserved[5]; | |
| 125 } ngx_http_fastcgi_begin_request_t; | |
| 126 | |
| 127 | |
| 509 | 128 typedef struct { |
| 129 u_char version; | |
| 130 u_char type; | |
| 131 u_char request_id_hi; | |
| 132 u_char request_id_lo; | |
| 133 } ngx_http_fastcgi_header_small_t; | |
| 134 | |
| 135 | |
| 136 typedef struct { | |
| 137 ngx_http_fastcgi_header_t h0; | |
| 138 ngx_http_fastcgi_begin_request_t br; | |
| 139 ngx_http_fastcgi_header_small_t h1; | |
| 140 } ngx_http_fastcgi_request_start_t; | |
| 141 | |
| 142 | |
|
2390
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
143 static ngx_int_t ngx_http_fastcgi_eval(ngx_http_request_t *r, |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
144 ngx_http_fastcgi_loc_conf_t *flcf); |
| 2602 | 145 #if (NGX_HTTP_CACHE) |
| 146 static ngx_int_t ngx_http_fastcgi_create_key(ngx_http_request_t *r); | |
| 147 #endif | |
| 479 | 148 static ngx_int_t ngx_http_fastcgi_create_request(ngx_http_request_t *r); |
| 149 static ngx_int_t ngx_http_fastcgi_reinit_request(ngx_http_request_t *r); | |
| 150 static ngx_int_t ngx_http_fastcgi_process_header(ngx_http_request_t *r); | |
|
4122
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
151 static ngx_int_t ngx_http_fastcgi_input_filter_init(void *data); |
| 479 | 152 static ngx_int_t ngx_http_fastcgi_input_filter(ngx_event_pipe_t *p, |
| 487 | 153 ngx_buf_t *buf); |
|
5394
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
154 static ngx_int_t ngx_http_fastcgi_non_buffered_filter(void *data, |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
155 ssize_t bytes); |
| 479 | 156 static ngx_int_t ngx_http_fastcgi_process_record(ngx_http_request_t *r, |
| 487 | 157 ngx_http_fastcgi_ctx_t *f); |
| 479 | 158 static void ngx_http_fastcgi_abort_request(ngx_http_request_t *r); |
| 159 static void ngx_http_fastcgi_finalize_request(ngx_http_request_t *r, | |
| 487 | 160 ngx_int_t rc); |
| 479 | 161 |
| 509 | 162 static ngx_int_t ngx_http_fastcgi_add_variables(ngx_conf_t *cf); |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
163 static void *ngx_http_fastcgi_create_main_conf(ngx_conf_t *cf); |
| 509 | 164 static void *ngx_http_fastcgi_create_loc_conf(ngx_conf_t *cf); |
| 165 static char *ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, | |
| 166 void *parent, void *child); | |
|
5907
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5905
diff
changeset
|
167 static ngx_int_t ngx_http_fastcgi_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
|
168 ngx_http_fastcgi_loc_conf_t *conf, ngx_http_fastcgi_params_t *params, |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
169 ngx_keyval_t *default_params); |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
170 |
| 573 | 171 static ngx_int_t ngx_http_fastcgi_script_name_variable(ngx_http_request_t *r, |
| 172 ngx_http_variable_value_t *v, uintptr_t data); | |
| 2443 | 173 static ngx_int_t ngx_http_fastcgi_path_info_variable(ngx_http_request_t *r, |
| 174 ngx_http_variable_value_t *v, uintptr_t data); | |
|
2467
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
175 static ngx_http_fastcgi_ctx_t *ngx_http_fastcgi_split(ngx_http_request_t *r, |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
176 ngx_http_fastcgi_loc_conf_t *flcf); |
| 509 | 177 |
| 479 | 178 static char *ngx_http_fastcgi_pass(ngx_conf_t *cf, ngx_command_t *cmd, |
| 487 | 179 void *conf); |
| 2443 | 180 static char *ngx_http_fastcgi_split_path_info(ngx_conf_t *cf, |
| 181 ngx_command_t *cmd, void *conf); | |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
182 static char *ngx_http_fastcgi_store(ngx_conf_t *cf, ngx_command_t *cmd, |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
183 void *conf); |
| 2602 | 184 #if (NGX_HTTP_CACHE) |
| 185 static char *ngx_http_fastcgi_cache(ngx_conf_t *cf, ngx_command_t *cmd, | |
| 186 void *conf); | |
| 187 static char *ngx_http_fastcgi_cache_key(ngx_conf_t *cf, ngx_command_t *cmd, | |
| 188 void *conf); | |
| 189 #endif | |
| 190 | |
| 479 | 191 static char *ngx_http_fastcgi_lowat_check(ngx_conf_t *cf, void *post, |
| 487 | 192 void *data); |
| 479 | 193 |
| 194 | |
| 509 | 195 static ngx_conf_post_t ngx_http_fastcgi_lowat_post = |
| 196 { ngx_http_fastcgi_lowat_check }; | |
| 479 | 197 |
| 198 | |
| 199 static ngx_conf_bitmask_t ngx_http_fastcgi_next_upstream_masks[] = { | |
| 200 { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR }, | |
| 201 { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT }, | |
| 202 { ngx_string("invalid_header"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER }, | |
| 203 { ngx_string("http_500"), NGX_HTTP_UPSTREAM_FT_HTTP_500 }, | |
| 623 | 204 { 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:
5028
diff
changeset
|
205 { ngx_string("http_403"), NGX_HTTP_UPSTREAM_FT_HTTP_403 }, |
| 479 | 206 { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 }, |
|
2927
55ceaef03d34
proxy_cache_use_stale/fastcgi_cache_use_stale updating
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
207 { ngx_string("updating"), NGX_HTTP_UPSTREAM_FT_UPDATING }, |
| 665 | 208 { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF }, |
| 479 | 209 { ngx_null_string, 0 } |
| 210 }; | |
| 211 | |
| 212 | |
| 2602 | 213 ngx_module_t ngx_http_fastcgi_module; |
| 214 | |
| 215 | |
| 479 | 216 static ngx_command_t ngx_http_fastcgi_commands[] = { |
| 217 | |
| 218 { ngx_string("fastcgi_pass"), | |
| 629 | 219 NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1, |
| 479 | 220 ngx_http_fastcgi_pass, |
| 221 NGX_HTTP_LOC_CONF_OFFSET, | |
| 222 0, | |
| 223 NULL }, | |
| 224 | |
| 225 { ngx_string("fastcgi_index"), | |
| 226 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 227 ngx_conf_set_str_slot, | |
| 228 NGX_HTTP_LOC_CONF_OFFSET, | |
| 229 offsetof(ngx_http_fastcgi_loc_conf_t, index), | |
| 230 NULL }, | |
| 231 | |
| 2443 | 232 { ngx_string("fastcgi_split_path_info"), |
| 233 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 234 ngx_http_fastcgi_split_path_info, | |
| 235 NGX_HTTP_LOC_CONF_OFFSET, | |
| 236 0, | |
| 237 NULL }, | |
| 238 | |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1276
diff
changeset
|
239 { ngx_string("fastcgi_store"), |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
240 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
241 ngx_http_fastcgi_store, |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
242 NGX_HTTP_LOC_CONF_OFFSET, |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
243 0, |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
244 NULL }, |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
245 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
246 { ngx_string("fastcgi_store_access"), |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1276
diff
changeset
|
247 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE123, |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1276
diff
changeset
|
248 ngx_conf_set_access_slot, |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1276
diff
changeset
|
249 NGX_HTTP_LOC_CONF_OFFSET, |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
250 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.store_access), |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1276
diff
changeset
|
251 NULL }, |
|
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1276
diff
changeset
|
252 |
|
5394
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
253 { ngx_string("fastcgi_buffering"), |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
254 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
255 ngx_conf_set_flag_slot, |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
256 NGX_HTTP_LOC_CONF_OFFSET, |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
257 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.buffering), |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
258 NULL }, |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
259 |
| 629 | 260 { ngx_string("fastcgi_ignore_client_abort"), |
| 261 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
| 262 ngx_conf_set_flag_slot, | |
| 263 NGX_HTTP_LOC_CONF_OFFSET, | |
| 264 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.ignore_client_abort), | |
| 265 NULL }, | |
| 266 | |
|
3271
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3197
diff
changeset
|
267 { ngx_string("fastcgi_bind"), |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3197
diff
changeset
|
268 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
| 3399 | 269 ngx_http_upstream_bind_set_slot, |
|
3271
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3197
diff
changeset
|
270 NGX_HTTP_LOC_CONF_OFFSET, |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3197
diff
changeset
|
271 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.local), |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3197
diff
changeset
|
272 NULL }, |
|
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3197
diff
changeset
|
273 |
| 479 | 274 { ngx_string("fastcgi_connect_timeout"), |
| 275 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 276 ngx_conf_set_msec_slot, | |
| 277 NGX_HTTP_LOC_CONF_OFFSET, | |
| 278 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.connect_timeout), | |
| 279 NULL }, | |
| 280 | |
| 281 { ngx_string("fastcgi_send_timeout"), | |
| 282 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 283 ngx_conf_set_msec_slot, | |
| 284 NGX_HTTP_LOC_CONF_OFFSET, | |
| 285 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.send_timeout), | |
| 286 NULL }, | |
| 287 | |
| 288 { ngx_string("fastcgi_send_lowat"), | |
| 289 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 290 ngx_conf_set_size_slot, | |
| 291 NGX_HTTP_LOC_CONF_OFFSET, | |
| 292 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.send_lowat), | |
| 293 &ngx_http_fastcgi_lowat_post }, | |
| 294 | |
| 581 | 295 { ngx_string("fastcgi_buffer_size"), |
| 296 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 297 ngx_conf_set_size_slot, | |
| 298 NGX_HTTP_LOC_CONF_OFFSET, | |
| 299 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.buffer_size), | |
| 300 NULL }, | |
| 301 | |
| 509 | 302 { ngx_string("fastcgi_pass_request_headers"), |
| 303 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
| 304 ngx_conf_set_flag_slot, | |
| 305 NGX_HTTP_LOC_CONF_OFFSET, | |
| 306 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.pass_request_headers), | |
| 307 NULL }, | |
| 308 | |
| 309 { ngx_string("fastcgi_pass_request_body"), | |
| 310 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
| 311 ngx_conf_set_flag_slot, | |
| 312 NGX_HTTP_LOC_CONF_OFFSET, | |
| 313 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.pass_request_body), | |
| 314 NULL }, | |
| 315 | |
| 657 | 316 { ngx_string("fastcgi_intercept_errors"), |
| 317 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
| 318 ngx_conf_set_flag_slot, | |
| 319 NGX_HTTP_LOC_CONF_OFFSET, | |
| 320 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.intercept_errors), | |
| 321 NULL }, | |
| 322 | |
| 479 | 323 { ngx_string("fastcgi_read_timeout"), |
| 324 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 325 ngx_conf_set_msec_slot, | |
| 326 NGX_HTTP_LOC_CONF_OFFSET, | |
| 327 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.read_timeout), | |
| 328 NULL }, | |
| 329 | |
| 330 { ngx_string("fastcgi_buffers"), | |
| 331 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2, | |
| 332 ngx_conf_set_bufs_slot, | |
| 333 NGX_HTTP_LOC_CONF_OFFSET, | |
| 334 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.bufs), | |
| 335 NULL }, | |
| 336 | |
| 337 { ngx_string("fastcgi_busy_buffers_size"), | |
| 338 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 339 ngx_conf_set_size_slot, | |
| 340 NGX_HTTP_LOC_CONF_OFFSET, | |
| 529 | 341 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.busy_buffers_size_conf), |
| 479 | 342 NULL }, |
| 343 | |
|
5874
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5847
diff
changeset
|
344 { ngx_string("fastcgi_force_ranges"), |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5847
diff
changeset
|
345 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:
5847
diff
changeset
|
346 ngx_conf_set_flag_slot, |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5847
diff
changeset
|
347 NGX_HTTP_LOC_CONF_OFFSET, |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5847
diff
changeset
|
348 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.force_ranges), |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5847
diff
changeset
|
349 NULL }, |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5847
diff
changeset
|
350 |
|
5883
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
351 { ngx_string("fastcgi_limit_rate"), |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
352 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
|
353 ngx_conf_set_size_slot, |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
354 NGX_HTTP_LOC_CONF_OFFSET, |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
355 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.limit_rate), |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
356 NULL }, |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
357 |
| 2602 | 358 #if (NGX_HTTP_CACHE) |
| 359 | |
| 360 { ngx_string("fastcgi_cache"), | |
| 3729 | 361 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
| 2602 | 362 ngx_http_fastcgi_cache, |
| 363 NGX_HTTP_LOC_CONF_OFFSET, | |
| 364 0, | |
| 365 NULL }, | |
| 366 | |
| 367 { ngx_string("fastcgi_cache_key"), | |
| 3729 | 368 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
| 2602 | 369 ngx_http_fastcgi_cache_key, |
| 370 NGX_HTTP_LOC_CONF_OFFSET, | |
| 371 0, | |
| 372 NULL }, | |
| 373 | |
| 374 { ngx_string("fastcgi_cache_path"), | |
| 375 NGX_HTTP_MAIN_CONF|NGX_CONF_2MORE, | |
| 376 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
|
377 NGX_HTTP_MAIN_CONF_OFFSET, |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
378 offsetof(ngx_http_fastcgi_main_conf_t, caches), |
| 2602 | 379 &ngx_http_fastcgi_module }, |
| 380 | |
|
3699
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3692
diff
changeset
|
381 { ngx_string("fastcgi_cache_bypass"), |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3692
diff
changeset
|
382 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:
3692
diff
changeset
|
383 ngx_http_set_predicate_slot, |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3692
diff
changeset
|
384 NGX_HTTP_LOC_CONF_OFFSET, |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3692
diff
changeset
|
385 offsetof(ngx_http_fastcgi_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:
3692
diff
changeset
|
386 NULL }, |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3692
diff
changeset
|
387 |
|
3526
62a4fd1e6e2c
proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3523
diff
changeset
|
388 { ngx_string("fastcgi_no_cache"), |
|
62a4fd1e6e2c
proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3523
diff
changeset
|
389 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
|
390 ngx_http_set_predicate_slot, |
|
3526
62a4fd1e6e2c
proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3523
diff
changeset
|
391 NGX_HTTP_LOC_CONF_OFFSET, |
|
62a4fd1e6e2c
proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3523
diff
changeset
|
392 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.no_cache), |
|
62a4fd1e6e2c
proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3523
diff
changeset
|
393 NULL }, |
|
62a4fd1e6e2c
proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3523
diff
changeset
|
394 |
| 2602 | 395 { ngx_string("fastcgi_cache_valid"), |
| 396 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | |
| 397 ngx_http_file_cache_valid_set_slot, | |
| 398 NGX_HTTP_LOC_CONF_OFFSET, | |
| 399 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_valid), | |
| 400 NULL }, | |
| 401 | |
| 2729 | 402 { ngx_string("fastcgi_cache_min_uses"), |
| 2602 | 403 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
| 404 ngx_conf_set_num_slot, | |
| 405 NGX_HTTP_LOC_CONF_OFFSET, | |
| 406 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_min_uses), | |
| 407 NULL }, | |
| 408 | |
| 409 { ngx_string("fastcgi_cache_use_stale"), | |
| 410 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | |
| 411 ngx_conf_set_bitmask_slot, | |
| 412 NGX_HTTP_LOC_CONF_OFFSET, | |
| 413 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_use_stale), | |
| 414 &ngx_http_fastcgi_next_upstream_masks }, | |
| 415 | |
|
2875
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
416 { ngx_string("fastcgi_cache_methods"), |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
417 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
418 ngx_conf_set_bitmask_slot, |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
419 NGX_HTTP_LOC_CONF_OFFSET, |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
420 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_methods), |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
421 &ngx_http_upstream_cache_method_mask }, |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
422 |
|
4386
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
423 { ngx_string("fastcgi_cache_lock"), |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
424 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:
4329
diff
changeset
|
425 ngx_conf_set_flag_slot, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
426 NGX_HTTP_LOC_CONF_OFFSET, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
427 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_lock), |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
428 NULL }, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
429 |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
430 { ngx_string("fastcgi_cache_lock_timeout"), |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
431 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:
4329
diff
changeset
|
432 ngx_conf_set_msec_slot, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
433 NGX_HTTP_LOC_CONF_OFFSET, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
434 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_lock_timeout), |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
435 NULL }, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
436 |
|
5905
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
437 { ngx_string("fastcgi_cache_lock_age"), |
|
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
438 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
|
439 ngx_conf_set_msec_slot, |
|
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
440 NGX_HTTP_LOC_CONF_OFFSET, |
|
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
441 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_lock_age), |
|
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
442 NULL }, |
|
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
443 |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5394
diff
changeset
|
444 { ngx_string("fastcgi_cache_revalidate"), |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5394
diff
changeset
|
445 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:
5394
diff
changeset
|
446 ngx_conf_set_flag_slot, |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5394
diff
changeset
|
447 NGX_HTTP_LOC_CONF_OFFSET, |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5394
diff
changeset
|
448 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.cache_revalidate), |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5394
diff
changeset
|
449 NULL }, |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5394
diff
changeset
|
450 |
| 2602 | 451 #endif |
| 452 | |
| 479 | 453 { ngx_string("fastcgi_temp_path"), |
| 454 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1234, | |
| 455 ngx_conf_set_path_slot, | |
| 456 NGX_HTTP_LOC_CONF_OFFSET, | |
| 457 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.temp_path), | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2467
diff
changeset
|
458 NULL }, |
| 479 | 459 |
| 460 { ngx_string("fastcgi_max_temp_file_size"), | |
| 461 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 462 ngx_conf_set_size_slot, | |
| 463 NGX_HTTP_LOC_CONF_OFFSET, | |
| 529 | 464 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.max_temp_file_size_conf), |
| 479 | 465 NULL }, |
| 466 | |
| 467 { ngx_string("fastcgi_temp_file_write_size"), | |
| 468 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
| 469 ngx_conf_set_size_slot, | |
| 470 NGX_HTTP_LOC_CONF_OFFSET, | |
| 529 | 471 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.temp_file_write_size_conf), |
| 479 | 472 NULL }, |
| 473 | |
| 474 { ngx_string("fastcgi_next_upstream"), | |
| 547 | 475 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, |
| 479 | 476 ngx_conf_set_bitmask_slot, |
| 477 NGX_HTTP_LOC_CONF_OFFSET, | |
| 478 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.next_upstream), | |
| 479 &ngx_http_fastcgi_next_upstream_masks }, | |
| 480 | |
|
5832
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
481 { ngx_string("fastcgi_next_upstream_tries"), |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
482 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
|
483 ngx_conf_set_num_slot, |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
484 NGX_HTTP_LOC_CONF_OFFSET, |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
485 offsetof(ngx_http_fastcgi_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
|
486 NULL }, |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
487 |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
488 { ngx_string("fastcgi_next_upstream_timeout"), |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
489 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
|
490 ngx_conf_set_msec_slot, |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
491 NGX_HTTP_LOC_CONF_OFFSET, |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
492 offsetof(ngx_http_fastcgi_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
|
493 NULL }, |
|
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
494 |
| 509 | 495 { ngx_string("fastcgi_param"), |
|
4329
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
496 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE23, |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
497 ngx_http_upstream_param_set_slot, |
| 485 | 498 NGX_HTTP_LOC_CONF_OFFSET, |
| 509 | 499 offsetof(ngx_http_fastcgi_loc_conf_t, params_source), |
| 485 | 500 NULL }, |
| 501 | |
| 649 | 502 { ngx_string("fastcgi_pass_header"), |
| 3729 | 503 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
| 649 | 504 ngx_conf_set_str_array_slot, |
| 505 NGX_HTTP_LOC_CONF_OFFSET, | |
| 506 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.pass_headers), | |
| 507 NULL }, | |
| 508 | |
| 509 { ngx_string("fastcgi_hide_header"), | |
| 3729 | 510 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
| 649 | 511 ngx_conf_set_str_array_slot, |
| 512 NGX_HTTP_LOC_CONF_OFFSET, | |
| 513 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.hide_headers), | |
| 514 NULL }, | |
| 515 | |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2729
diff
changeset
|
516 { ngx_string("fastcgi_ignore_headers"), |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2729
diff
changeset
|
517 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2729
diff
changeset
|
518 ngx_conf_set_bitmask_slot, |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2729
diff
changeset
|
519 NGX_HTTP_LOC_CONF_OFFSET, |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2729
diff
changeset
|
520 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.ignore_headers), |
|
3667
12bd9e26fadb
use shared ngx_http_upstream_ignore_headers_masks[]
Igor Sysoev <igor@sysoev.ru>
parents:
3610
diff
changeset
|
521 &ngx_http_upstream_ignore_headers_masks }, |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2729
diff
changeset
|
522 |
| 1228 | 523 { ngx_string("fastcgi_catch_stderr"), |
|
4273
e444e8f6538b
Fixed NGX_CONF_TAKE1/NGX_CONF_FLAG misuse.
Sergey Budnevitch <sb@waeme.net>
parents:
4136
diff
changeset
|
524 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
| 1228 | 525 ngx_conf_set_str_array_slot, |
| 526 NGX_HTTP_LOC_CONF_OFFSET, | |
| 527 offsetof(ngx_http_fastcgi_loc_conf_t, catch_stderr), | |
| 528 NULL }, | |
| 529 | |
|
4122
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
530 { ngx_string("fastcgi_keep_conn"), |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
531 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
532 ngx_conf_set_flag_slot, |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
533 NGX_HTTP_LOC_CONF_OFFSET, |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
534 offsetof(ngx_http_fastcgi_loc_conf_t, keep_conn), |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
535 NULL }, |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
536 |
| 479 | 537 ngx_null_command |
| 538 }; | |
| 539 | |
| 540 | |
| 667 | 541 static ngx_http_module_t ngx_http_fastcgi_module_ctx = { |
| 509 | 542 ngx_http_fastcgi_add_variables, /* preconfiguration */ |
| 543 NULL, /* postconfiguration */ | |
| 479 | 544 |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
545 ngx_http_fastcgi_create_main_conf, /* create main configuration */ |
| 479 | 546 NULL, /* init main configuration */ |
| 547 | |
| 548 NULL, /* create server configuration */ | |
| 549 NULL, /* merge server configuration */ | |
| 550 | |
| 551 ngx_http_fastcgi_create_loc_conf, /* create location configuration */ | |
| 552 ngx_http_fastcgi_merge_loc_conf /* merge location configuration */ | |
| 553 }; | |
| 554 | |
| 555 | |
| 556 ngx_module_t ngx_http_fastcgi_module = { | |
| 509 | 557 NGX_MODULE_V1, |
| 479 | 558 &ngx_http_fastcgi_module_ctx, /* module context */ |
| 559 ngx_http_fastcgi_commands, /* module directives */ | |
| 560 NGX_HTTP_MODULE, /* module type */ | |
| 541 | 561 NULL, /* init master */ |
| 479 | 562 NULL, /* init module */ |
| 541 | 563 NULL, /* init process */ |
| 564 NULL, /* init thread */ | |
| 565 NULL, /* exit thread */ | |
| 566 NULL, /* exit process */ | |
| 567 NULL, /* exit master */ | |
| 568 NGX_MODULE_V1_PADDING | |
| 479 | 569 }; |
| 570 | |
| 571 | |
| 1883 | 572 static ngx_http_fastcgi_request_start_t ngx_http_fastcgi_request_start = { |
| 573 { 1, /* version */ | |
| 574 NGX_HTTP_FASTCGI_BEGIN_REQUEST, /* type */ | |
| 575 0, /* request_id_hi */ | |
| 576 1, /* request_id_lo */ | |
| 577 0, /* content_length_hi */ | |
| 578 sizeof(ngx_http_fastcgi_begin_request_t), /* content_length_lo */ | |
| 579 0, /* padding_length */ | |
| 580 0 }, /* reserved */ | |
| 581 | |
| 582 { 0, /* role_hi */ | |
| 583 NGX_HTTP_FASTCGI_RESPONDER, /* role_lo */ | |
| 584 0, /* NGX_HTTP_FASTCGI_KEEP_CONN */ /* flags */ | |
| 585 { 0, 0, 0, 0, 0 } }, /* reserved[5] */ | |
| 586 | |
| 587 { 1, /* version */ | |
| 588 NGX_HTTP_FASTCGI_PARAMS, /* type */ | |
| 589 0, /* request_id_hi */ | |
| 590 1 }, /* request_id_lo */ | |
| 591 | |
| 592 }; | |
| 593 | |
| 594 | |
| 2443 | 595 static ngx_http_variable_t ngx_http_fastcgi_vars[] = { |
| 596 | |
| 597 { ngx_string("fastcgi_script_name"), NULL, | |
| 598 ngx_http_fastcgi_script_name_variable, 0, | |
| 599 NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 }, | |
| 600 | |
| 601 { ngx_string("fastcgi_path_info"), NULL, | |
| 602 ngx_http_fastcgi_path_info_variable, 0, | |
| 603 NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 }, | |
| 604 | |
| 605 { ngx_null_string, NULL, NULL, 0, 0, 0 } | |
| 606 }; | |
| 1884 | 607 |
| 608 | |
| 649 | 609 static ngx_str_t ngx_http_fastcgi_hide_headers[] = { |
| 610 ngx_string("Status"), | |
| 611 ngx_string("X-Accel-Expires"), | |
| 612 ngx_string("X-Accel-Redirect"), | |
| 613 ngx_string("X-Accel-Limit-Rate"), | |
|
1886
2819956d1ca0
add X-Accel-Charset to ingored header, fix X-Accel-Buffering
Igor Sysoev <igor@sysoev.ru>
parents:
1884
diff
changeset
|
614 ngx_string("X-Accel-Buffering"), |
|
2819956d1ca0
add X-Accel-Charset to ingored header, fix X-Accel-Buffering
Igor Sysoev <igor@sysoev.ru>
parents:
1884
diff
changeset
|
615 ngx_string("X-Accel-Charset"), |
| 649 | 616 ngx_null_string |
| 617 }; | |
| 618 | |
| 619 | |
|
3197
d5d1ad05d3a6
hide cacheable Set-Cookie and P3P FastCGI response headers
Igor Sysoev <igor@sysoev.ru>
parents:
3025
diff
changeset
|
620 #if (NGX_HTTP_CACHE) |
|
d5d1ad05d3a6
hide cacheable Set-Cookie and P3P FastCGI response headers
Igor Sysoev <igor@sysoev.ru>
parents:
3025
diff
changeset
|
621 |
|
3563
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
622 static ngx_keyval_t ngx_http_fastcgi_cache_headers[] = { |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5394
diff
changeset
|
623 { ngx_string("HTTP_IF_MODIFIED_SINCE"), |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5394
diff
changeset
|
624 ngx_string("$upstream_cache_last_modified") }, |
|
3563
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
625 { ngx_string("HTTP_IF_UNMODIFIED_SINCE"), ngx_string("") }, |
|
5738
c95d7882dfc9
Upstream: cache revalidation using If-None-Match.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5604
diff
changeset
|
626 { ngx_string("HTTP_IF_NONE_MATCH"), ngx_string("$upstream_cache_etag") }, |
|
3563
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
627 { ngx_string("HTTP_IF_MATCH"), ngx_string("") }, |
|
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
628 { ngx_string("HTTP_RANGE"), ngx_string("") }, |
|
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
629 { ngx_string("HTTP_IF_RANGE"), ngx_string("") }, |
|
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
630 { ngx_null_string, ngx_null_string } |
|
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
631 }; |
|
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
632 |
|
3197
d5d1ad05d3a6
hide cacheable Set-Cookie and P3P FastCGI response headers
Igor Sysoev <igor@sysoev.ru>
parents:
3025
diff
changeset
|
633 #endif |
|
d5d1ad05d3a6
hide cacheable Set-Cookie and P3P FastCGI response headers
Igor Sysoev <igor@sysoev.ru>
parents:
3025
diff
changeset
|
634 |
|
d5d1ad05d3a6
hide cacheable Set-Cookie and P3P FastCGI response headers
Igor Sysoev <igor@sysoev.ru>
parents:
3025
diff
changeset
|
635 |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2467
diff
changeset
|
636 static ngx_path_init_t ngx_http_fastcgi_temp_path = { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2467
diff
changeset
|
637 ngx_string(NGX_HTTP_FASTCGI_TEMP_PATH), { 1, 2, 0 } |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2467
diff
changeset
|
638 }; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2467
diff
changeset
|
639 |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2467
diff
changeset
|
640 |
| 487 | 641 static ngx_int_t |
| 642 ngx_http_fastcgi_handler(ngx_http_request_t *r) | |
| 479 | 643 { |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
644 ngx_int_t rc; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
645 ngx_http_upstream_t *u; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
646 ngx_http_fastcgi_ctx_t *f; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
647 ngx_http_fastcgi_loc_conf_t *flcf; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
648 #if (NGX_HTTP_CACHE) |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
649 ngx_http_fastcgi_main_conf_t *fmcf; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
650 #endif |
| 479 | 651 |
|
3006
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
2989
diff
changeset
|
652 if (ngx_http_upstream_create(r) != NGX_OK) { |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
2989
diff
changeset
|
653 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
2989
diff
changeset
|
654 } |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
2989
diff
changeset
|
655 |
| 2443 | 656 f = ngx_pcalloc(r->pool, sizeof(ngx_http_fastcgi_ctx_t)); |
| 657 if (f == NULL) { | |
|
3006
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
2989
diff
changeset
|
658 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
| 2443 | 659 } |
| 660 | |
| 661 ngx_http_set_ctx(r, f, ngx_http_fastcgi_module); | |
|
2395
b1a24d3cf4dd
clear fastcgi ctx for internal redirection via named location
Igor Sysoev <igor@sysoev.ru>
parents:
2391
diff
changeset
|
662 |
|
2390
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
663 flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module); |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
664 |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
665 if (flcf->fastcgi_lengths) { |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
666 if (ngx_http_fastcgi_eval(r, flcf) != NGX_OK) { |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
667 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
668 } |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
669 } |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
670 |
|
3006
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
2989
diff
changeset
|
671 u = r->upstream; |
|
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
2989
diff
changeset
|
672 |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3494
diff
changeset
|
673 ngx_str_set(&u->schema, "fastcgi://"); |
| 479 | 674 u->output.tag = (ngx_buf_tag_t) &ngx_http_fastcgi_module; |
| 675 | |
| 676 u->conf = &flcf->upstream; | |
| 677 | |
| 2602 | 678 #if (NGX_HTTP_CACHE) |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
679 fmcf = ngx_http_get_module_main_conf(r, ngx_http_fastcgi_module); |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
680 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
681 u->caches = &fmcf->caches; |
| 2602 | 682 u->create_key = ngx_http_fastcgi_create_key; |
| 683 #endif | |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
684 |
| 479 | 685 u->create_request = ngx_http_fastcgi_create_request; |
| 686 u->reinit_request = ngx_http_fastcgi_reinit_request; | |
| 687 u->process_header = ngx_http_fastcgi_process_header; | |
| 688 u->abort_request = ngx_http_fastcgi_abort_request; | |
| 689 u->finalize_request = ngx_http_fastcgi_finalize_request; | |
|
4615
adcd60233817
Added r->state reset on fastcgi/scgi/uwsgi request start.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4593
diff
changeset
|
690 r->state = 0; |
| 479 | 691 |
|
5394
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
692 u->buffering = flcf->upstream.buffering; |
| 649 | 693 |
| 581 | 694 u->pipe = ngx_pcalloc(r->pool, sizeof(ngx_event_pipe_t)); |
| 695 if (u->pipe == NULL) { | |
| 696 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
| 697 } | |
| 698 | |
| 699 u->pipe->input_filter = ngx_http_fastcgi_input_filter; | |
| 700 u->pipe->input_ctx = r; | |
| 479 | 701 |
|
4122
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
702 u->input_filter_init = ngx_http_fastcgi_input_filter_init; |
|
5394
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
703 u->input_filter = ngx_http_fastcgi_non_buffered_filter; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
704 u->input_filter_ctx = r; |
|
4122
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
705 |
| 479 | 706 rc = ngx_http_read_client_request_body(r, ngx_http_upstream_init); |
| 707 | |
| 708 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) { | |
| 709 return rc; | |
| 710 } | |
| 711 | |
| 712 return NGX_DONE; | |
| 713 } | |
| 714 | |
| 715 | |
| 487 | 716 static ngx_int_t |
|
2390
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
717 ngx_http_fastcgi_eval(ngx_http_request_t *r, ngx_http_fastcgi_loc_conf_t *flcf) |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
718 { |
| 3610 | 719 ngx_url_t url; |
| 720 ngx_http_upstream_t *u; | |
| 721 | |
| 722 ngx_memzero(&url, sizeof(ngx_url_t)); | |
| 723 | |
| 724 if (ngx_http_script_run(r, &url.url, flcf->fastcgi_lengths->elts, 0, | |
|
2390
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
725 flcf->fastcgi_values->elts) |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
726 == NULL) |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
727 { |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
728 return NGX_ERROR; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
729 } |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
730 |
| 3610 | 731 url.no_resolve = 1; |
| 732 | |
| 733 if (ngx_parse_url(r->pool, &url) != NGX_OK) { | |
| 734 if (url.err) { | |
|
2390
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
735 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
| 3610 | 736 "%s in upstream \"%V\"", url.err, &url.url); |
|
2390
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
737 } |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
738 |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
739 return NGX_ERROR; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
740 } |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
741 |
| 3610 | 742 u = r->upstream; |
| 743 | |
| 744 u->resolved = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_resolved_t)); | |
| 745 if (u->resolved == NULL) { | |
| 746 return NGX_ERROR; | |
| 747 } | |
| 748 | |
| 749 if (url.addrs && url.addrs[0].sockaddr) { | |
| 750 u->resolved->sockaddr = url.addrs[0].sockaddr; | |
| 751 u->resolved->socklen = url.addrs[0].socklen; | |
| 752 u->resolved->naddrs = 1; | |
| 753 u->resolved->host = url.addrs[0].name; | |
|
2422
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2396
diff
changeset
|
754 |
|
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2396
diff
changeset
|
755 } else { |
| 3610 | 756 u->resolved->host = url.host; |
| 757 u->resolved->port = url.port; | |
|
3879
502a6b0acf3f
fix case when a host in fastcgi_pass, scgi_pass, and uwsgi_pass
Igor Sysoev <igor@sysoev.ru>
parents:
3850
diff
changeset
|
758 u->resolved->no_port = url.no_port; |
|
2422
7af1e5fe102c
variable support for unix sockets in fastcgi_pass and proxy_pass
Igor Sysoev <igor@sysoev.ru>
parents:
2396
diff
changeset
|
759 } |
|
2390
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
760 |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
761 return NGX_OK; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
762 } |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
763 |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
764 |
| 2602 | 765 #if (NGX_HTTP_CACHE) |
| 766 | |
| 767 static ngx_int_t | |
| 768 ngx_http_fastcgi_create_key(ngx_http_request_t *r) | |
| 769 { | |
| 770 ngx_str_t *key; | |
| 771 ngx_http_fastcgi_loc_conf_t *flcf; | |
| 772 | |
| 773 key = ngx_array_push(&r->cache->keys); | |
| 774 if (key == NULL) { | |
| 775 return NGX_ERROR; | |
| 776 } | |
| 777 | |
| 778 flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module); | |
| 779 | |
| 780 if (ngx_http_complex_value(r, &flcf->cache_key, key) != NGX_OK) { | |
| 781 return NGX_ERROR; | |
| 782 } | |
| 783 | |
| 784 return NGX_OK; | |
| 785 } | |
| 786 | |
| 787 #endif | |
| 788 | |
| 789 | |
|
2390
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
790 static ngx_int_t |
| 487 | 791 ngx_http_fastcgi_create_request(ngx_http_request_t *r) |
| 479 | 792 { |
| 509 | 793 off_t file_pos; |
|
3560
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
794 u_char ch, *pos, *lowcase_key; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
795 size_t size, len, key_len, val_len, padding, |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
796 allocated; |
|
4329
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
797 ngx_uint_t i, n, next, hash, skip_empty, header_params; |
| 509 | 798 ngx_buf_t *b; |
| 799 ngx_chain_t *cl, *body; | |
| 800 ngx_list_part_t *part; | |
|
3560
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
801 ngx_table_elt_t *header, **ignored; |
| 509 | 802 ngx_http_script_code_pt code; |
| 803 ngx_http_script_engine_t e, le; | |
| 804 ngx_http_fastcgi_header_t *h; | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
805 ngx_http_fastcgi_params_t *params; |
| 509 | 806 ngx_http_fastcgi_loc_conf_t *flcf; |
| 807 ngx_http_script_len_code_pt lcode; | |
| 479 | 808 |
| 509 | 809 len = 0; |
|
3560
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
810 header_params = 0; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
811 ignored = NULL; |
| 485 | 812 |
| 479 | 813 flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module); |
| 814 | |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
815 #if (NGX_HTTP_CACHE) |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
816 params = r->upstream->cacheable ? &flcf->params_cache : &flcf->params; |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
817 #else |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
818 params = &flcf->params; |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
819 #endif |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
820 |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
821 if (params->lengths) { |
| 509 | 822 ngx_memzero(&le, sizeof(ngx_http_script_engine_t)); |
| 479 | 823 |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
824 ngx_http_script_flush_no_cacheable_variables(r, params->flushes); |
| 573 | 825 le.flushed = 1; |
| 826 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
827 le.ip = params->lengths->elts; |
| 509 | 828 le.request = r; |
| 479 | 829 |
| 509 | 830 while (*(uintptr_t *) le.ip) { |
| 487 | 831 |
| 509 | 832 lcode = *(ngx_http_script_len_code_pt *) le.ip; |
| 833 key_len = lcode(&le); | |
| 479 | 834 |
|
4329
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
835 lcode = *(ngx_http_script_len_code_pt *) le.ip; |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
836 skip_empty = lcode(&le); |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
837 |
| 509 | 838 for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode(&le)) { |
| 839 lcode = *(ngx_http_script_len_code_pt *) le.ip; | |
| 840 } | |
| 841 le.ip += sizeof(uintptr_t); | |
| 479 | 842 |
|
4329
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
843 if (skip_empty && val_len == 0) { |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
844 continue; |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
845 } |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
846 |
| 537 | 847 len += 1 + key_len + ((val_len > 127) ? 4 : 1) + val_len; |
| 485 | 848 } |
| 849 } | |
| 850 | |
| 509 | 851 if (flcf->upstream.pass_request_headers) { |
| 485 | 852 |
|
3560
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
853 allocated = 0; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
854 lowcase_key = NULL; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
855 |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
856 if (params->number) { |
|
4015
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
857 n = 0; |
|
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
858 part = &r->headers_in.headers.part; |
|
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
859 |
|
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
860 while (part) { |
|
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
861 n += part->nelts; |
|
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
862 part = part->next; |
|
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
863 } |
|
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
864 |
|
e0a435f5f504
Fix ignored headers handling in fastcgi/scgi/uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
3976
diff
changeset
|
865 ignored = ngx_palloc(r->pool, n * sizeof(void *)); |
|
3560
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
866 if (ignored == NULL) { |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
867 return NGX_ERROR; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
868 } |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
869 } |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
870 |
| 509 | 871 part = &r->headers_in.headers.part; |
| 872 header = part->elts; | |
| 873 | |
| 874 for (i = 0; /* void */; i++) { | |
| 479 | 875 |
| 509 | 876 if (i >= part->nelts) { |
| 877 if (part->next == NULL) { | |
| 878 break; | |
| 879 } | |
| 479 | 880 |
| 509 | 881 part = part->next; |
| 882 header = part->elts; | |
| 883 i = 0; | |
| 479 | 884 } |
| 885 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
886 if (params->number) { |
|
3560
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
887 if (allocated < header[i].key.len) { |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
888 allocated = header[i].key.len + 16; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
889 lowcase_key = ngx_pnalloc(r->pool, allocated); |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
890 if (lowcase_key == NULL) { |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
891 return NGX_ERROR; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
892 } |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
893 } |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
894 |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
895 hash = 0; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
896 |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
897 for (n = 0; n < header[i].key.len; n++) { |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
898 ch = header[i].key.data[n]; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
899 |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
900 if (ch >= 'A' && ch <= 'Z') { |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
901 ch |= 0x20; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
902 |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
903 } else if (ch == '-') { |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
904 ch = '_'; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
905 } |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
906 |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
907 hash = ngx_hash(hash, ch); |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
908 lowcase_key[n] = ch; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
909 } |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
910 |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
911 if (ngx_hash_find(¶ms->hash, hash, lowcase_key, n)) { |
|
3560
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
912 ignored[header_params++] = &header[i]; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
913 continue; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
914 } |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
915 |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
916 n += sizeof("HTTP_") - 1; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
917 |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
918 } else { |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
919 n = sizeof("HTTP_") - 1 + header[i].key.len; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
920 } |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
921 |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
922 len += ((n > 127) ? 4 : 1) + ((header[i].value.len > 127) ? 4 : 1) |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
923 + n + header[i].value.len; |
| 479 | 924 } |
| 925 } | |
| 926 | |
| 927 | |
| 928 if (len > 65535) { | |
| 929 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, | |
| 1678 | 930 "fastcgi request record is too big: %uz", len); |
| 479 | 931 return NGX_ERROR; |
| 932 } | |
| 933 | |
| 934 | |
| 935 padding = 8 - len % 8; | |
| 936 padding = (padding == 8) ? 0 : padding; | |
| 937 | |
| 938 | |
| 939 size = sizeof(ngx_http_fastcgi_header_t) | |
| 940 + sizeof(ngx_http_fastcgi_begin_request_t) | |
| 941 | |
| 942 + sizeof(ngx_http_fastcgi_header_t) /* NGX_HTTP_FASTCGI_PARAMS */ | |
| 943 + len + padding | |
| 944 + sizeof(ngx_http_fastcgi_header_t) /* NGX_HTTP_FASTCGI_PARAMS */ | |
| 945 | |
| 946 + sizeof(ngx_http_fastcgi_header_t); /* NGX_HTTP_FASTCGI_STDIN */ | |
| 947 | |
| 948 | |
| 501 | 949 b = ngx_create_temp_buf(r->pool, size); |
| 950 if (b == NULL) { | |
| 479 | 951 return NGX_ERROR; |
| 952 } | |
| 953 | |
| 501 | 954 cl = ngx_alloc_chain_link(r->pool); |
| 955 if (cl == NULL) { | |
| 479 | 956 return NGX_ERROR; |
| 957 } | |
| 958 | |
| 959 cl->buf = b; | |
| 960 | |
|
4122
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
961 ngx_http_fastcgi_request_start.br.flags = |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
962 flcf->keep_conn ? NGX_HTTP_FASTCGI_KEEP_CONN : 0; |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
963 |
| 509 | 964 ngx_memcpy(b->pos, &ngx_http_fastcgi_request_start, |
| 965 sizeof(ngx_http_fastcgi_request_start_t)); | |
| 479 | 966 |
| 967 h = (ngx_http_fastcgi_header_t *) | |
| 968 (b->pos + sizeof(ngx_http_fastcgi_header_t) | |
| 969 + sizeof(ngx_http_fastcgi_begin_request_t)); | |
| 970 | |
| 971 h->content_length_hi = (u_char) ((len >> 8) & 0xff); | |
| 972 h->content_length_lo = (u_char) (len & 0xff); | |
| 973 h->padding_length = (u_char) padding; | |
| 974 h->reserved = 0; | |
| 975 | |
| 976 b->last = b->pos + sizeof(ngx_http_fastcgi_header_t) | |
| 977 + sizeof(ngx_http_fastcgi_begin_request_t) | |
| 978 + sizeof(ngx_http_fastcgi_header_t); | |
| 979 | |
| 980 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
981 if (params->lengths) { |
| 509 | 982 ngx_memzero(&e, sizeof(ngx_http_script_engine_t)); |
| 479 | 983 |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
984 e.ip = params->values->elts; |
| 509 | 985 e.pos = b->last; |
| 986 e.request = r; | |
| 573 | 987 e.flushed = 1; |
| 479 | 988 |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
989 le.ip = params->lengths->elts; |
| 479 | 990 |
| 509 | 991 while (*(uintptr_t *) le.ip) { |
| 479 | 992 |
| 509 | 993 lcode = *(ngx_http_script_len_code_pt *) le.ip; |
| 994 key_len = (u_char) lcode(&le); | |
| 479 | 995 |
|
4329
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
996 lcode = *(ngx_http_script_len_code_pt *) le.ip; |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
997 skip_empty = lcode(&le); |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
998 |
| 509 | 999 for (val_len = 0; *(uintptr_t *) le.ip; val_len += lcode(&le)) { |
| 1000 lcode = *(ngx_http_script_len_code_pt *) le.ip; | |
| 1001 } | |
| 1002 le.ip += sizeof(uintptr_t); | |
| 479 | 1003 |
|
4329
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
1004 if (skip_empty && val_len == 0) { |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
1005 e.skip = 1; |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
1006 |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
1007 while (*(uintptr_t *) e.ip) { |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
1008 code = *(ngx_http_script_code_pt *) e.ip; |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
1009 code((ngx_http_script_engine_t *) &e); |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
1010 } |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
1011 e.ip += sizeof(uintptr_t); |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
1012 |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
1013 e.skip = 0; |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
1014 |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
1015 continue; |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
1016 } |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
1017 |
| 537 | 1018 *e.pos++ = (u_char) key_len; |
| 479 | 1019 |
| 537 | 1020 if (val_len > 127) { |
| 1021 *e.pos++ = (u_char) (((val_len >> 24) & 0x7f) | 0x80); | |
| 1022 *e.pos++ = (u_char) ((val_len >> 16) & 0xff); | |
| 1023 *e.pos++ = (u_char) ((val_len >> 8) & 0xff); | |
| 1024 *e.pos++ = (u_char) (val_len & 0xff); | |
| 479 | 1025 |
| 537 | 1026 } else { |
| 1027 *e.pos++ = (u_char) val_len; | |
| 509 | 1028 } |
| 479 | 1029 |
| 509 | 1030 while (*(uintptr_t *) e.ip) { |
| 1031 code = *(ngx_http_script_code_pt *) e.ip; | |
| 1032 code((ngx_http_script_engine_t *) &e); | |
| 1033 } | |
| 1034 e.ip += sizeof(uintptr_t); | |
| 1945 | 1035 |
| 1036 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 1037 "fastcgi param: \"%*s: %*s\"", | |
| 1038 key_len, e.pos - (key_len + val_len), | |
| 1039 val_len, e.pos - val_len); | |
| 479 | 1040 } |
| 1041 | |
| 509 | 1042 b->last = e.pos; |
| 487 | 1043 } |
| 1044 | |
| 1045 | |
| 509 | 1046 if (flcf->upstream.pass_request_headers) { |
| 479 | 1047 |
| 509 | 1048 part = &r->headers_in.headers.part; |
| 1049 header = part->elts; | |
| 479 | 1050 |
| 509 | 1051 for (i = 0; /* void */; i++) { |
| 491 | 1052 |
| 509 | 1053 if (i >= part->nelts) { |
| 1054 if (part->next == NULL) { | |
| 577 | 1055 break; |
| 509 | 1056 } |
| 577 | 1057 |
| 509 | 1058 part = part->next; |
| 1059 header = part->elts; | |
| 1060 i = 0; | |
| 1061 } | |
| 479 | 1062 |
|
3560
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
1063 for (n = 0; n < header_params; n++) { |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
1064 if (&header[i] == ignored[n]) { |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
1065 goto next; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
1066 } |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
1067 } |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
1068 |
|
3559
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1069 key_len = sizeof("HTTP_") - 1 + header[i].key.len; |
|
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1070 if (key_len > 127) { |
|
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1071 *b->last++ = (u_char) (((key_len >> 24) & 0x7f) | 0x80); |
|
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1072 *b->last++ = (u_char) ((key_len >> 16) & 0xff); |
|
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1073 *b->last++ = (u_char) ((key_len >> 8) & 0xff); |
|
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1074 *b->last++ = (u_char) (key_len & 0xff); |
| 577 | 1075 |
| 509 | 1076 } else { |
|
3559
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1077 *b->last++ = (u_char) key_len; |
| 487 | 1078 } |
| 1079 | |
|
3559
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1080 val_len = header[i].value.len; |
|
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1081 if (val_len > 127) { |
|
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1082 *b->last++ = (u_char) (((val_len >> 24) & 0x7f) | 0x80); |
|
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1083 *b->last++ = (u_char) ((val_len >> 16) & 0xff); |
|
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1084 *b->last++ = (u_char) ((val_len >> 8) & 0xff); |
|
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1085 *b->last++ = (u_char) (val_len & 0xff); |
| 487 | 1086 |
| 509 | 1087 } else { |
|
3559
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1088 *b->last++ = (u_char) val_len; |
| 479 | 1089 } |
| 1090 | |
| 509 | 1091 b->last = ngx_cpymem(b->last, "HTTP_", sizeof("HTTP_") - 1); |
| 479 | 1092 |
| 509 | 1093 for (n = 0; n < header[i].key.len; n++) { |
| 1094 ch = header[i].key.data[n]; | |
| 479 | 1095 |
| 509 | 1096 if (ch >= 'a' && ch <= 'z') { |
| 1097 ch &= ~0x20; | |
| 479 | 1098 |
| 509 | 1099 } else if (ch == '-') { |
| 1100 ch = '_'; | |
| 1101 } | |
| 479 | 1102 |
| 509 | 1103 *b->last++ = ch; |
| 479 | 1104 } |
| 1105 | |
|
3559
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1106 b->last = ngx_copy(b->last, header[i].value.data, val_len); |
|
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1107 |
|
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1108 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1109 "fastcgi param: \"%*s: %*s\"", |
|
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1110 key_len, b->last - (key_len + val_len), |
|
519dcf4cb3de
add client request headers debug logging in fastcgi
Igor Sysoev <igor@sysoev.ru>
parents:
3558
diff
changeset
|
1111 val_len, b->last - val_len); |
|
3560
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
1112 next: |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
1113 |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
1114 continue; |
| 479 | 1115 } |
| 1116 } | |
| 1117 | |
| 1118 | |
| 1119 if (padding) { | |
| 1120 ngx_memzero(b->last, padding); | |
| 1121 b->last += padding; | |
| 1122 } | |
| 1123 | |
| 1124 | |
| 1125 h = (ngx_http_fastcgi_header_t *) b->last; | |
| 1126 b->last += sizeof(ngx_http_fastcgi_header_t); | |
| 1127 | |
| 1128 h->version = 1; | |
| 1129 h->type = NGX_HTTP_FASTCGI_PARAMS; | |
| 1130 h->request_id_hi = 0; | |
| 1131 h->request_id_lo = 1; | |
| 1132 h->content_length_hi = 0; | |
| 1133 h->content_length_lo = 0; | |
| 1134 h->padding_length = 0; | |
| 1135 h->reserved = 0; | |
| 1136 | |
| 1137 h = (ngx_http_fastcgi_header_t *) b->last; | |
| 1138 b->last += sizeof(ngx_http_fastcgi_header_t); | |
| 1139 | |
| 509 | 1140 if (flcf->upstream.pass_request_body) { |
| 1141 body = r->upstream->request_bufs; | |
| 1142 r->upstream->request_bufs = cl; | |
| 479 | 1143 |
| 1144 #if (NGX_SUPPRESS_WARN) | |
| 509 | 1145 file_pos = 0; |
| 1146 pos = NULL; | |
| 479 | 1147 #endif |
| 1148 | |
| 509 | 1149 while (body) { |
| 479 | 1150 |
| 509 | 1151 if (body->buf->in_file) { |
| 1152 file_pos = body->buf->file_pos; | |
| 479 | 1153 |
| 509 | 1154 } else { |
| 1155 pos = body->buf->pos; | |
| 479 | 1156 } |
| 1157 | |
| 509 | 1158 next = 0; |
| 479 | 1159 |
| 509 | 1160 do { |
| 1161 b = ngx_alloc_buf(r->pool); | |
| 1162 if (b == NULL) { | |
| 1163 return NGX_ERROR; | |
| 479 | 1164 } |
| 1165 | |
| 509 | 1166 ngx_memcpy(b, body->buf, sizeof(ngx_buf_t)); |
| 1167 | |
| 1168 if (body->buf->in_file) { | |
| 1169 b->file_pos = file_pos; | |
| 1170 file_pos += 32 * 1024; | |
| 479 | 1171 |
|
1142
e479e0b02e5a
fix "zero size buf" if request body file is multiple of 32K and FastCGI is used
Igor Sysoev <igor@sysoev.ru>
parents:
1125
diff
changeset
|
1172 if (file_pos >= body->buf->file_last) { |
| 509 | 1173 file_pos = body->buf->file_last; |
| 1174 next = 1; | |
| 1175 } | |
| 1176 | |
| 1177 b->file_last = file_pos; | |
| 1178 len = (ngx_uint_t) (file_pos - b->file_pos); | |
| 1179 | |
| 1180 } else { | |
| 1181 b->pos = pos; | |
|
5847
52b4984d2b3c
FastCGI: fixed start pointers in request buffers.
Roman Arutyunyan <arut@nginx.com>
parents:
5832
diff
changeset
|
1182 b->start = pos; |
| 509 | 1183 pos += 32 * 1024; |
| 479 | 1184 |
|
1142
e479e0b02e5a
fix "zero size buf" if request body file is multiple of 32K and FastCGI is used
Igor Sysoev <igor@sysoev.ru>
parents:
1125
diff
changeset
|
1185 if (pos >= body->buf->last) { |
| 509 | 1186 pos = body->buf->last; |
| 1187 next = 1; | |
| 1188 } | |
| 1189 | |
| 1190 b->last = pos; | |
| 1191 len = (ngx_uint_t) (pos - b->pos); | |
| 1192 } | |
| 479 | 1193 |
| 509 | 1194 padding = 8 - len % 8; |
| 1195 padding = (padding == 8) ? 0 : padding; | |
| 479 | 1196 |
| 509 | 1197 h->version = 1; |
| 1198 h->type = NGX_HTTP_FASTCGI_STDIN; | |
| 1199 h->request_id_hi = 0; | |
| 1200 h->request_id_lo = 1; | |
| 1201 h->content_length_hi = (u_char) ((len >> 8) & 0xff); | |
| 1202 h->content_length_lo = (u_char) (len & 0xff); | |
| 1203 h->padding_length = (u_char) padding; | |
| 1204 h->reserved = 0; | |
| 479 | 1205 |
| 509 | 1206 cl->next = ngx_alloc_chain_link(r->pool); |
| 1207 if (cl->next == NULL) { | |
| 1208 return NGX_ERROR; | |
| 1209 } | |
| 479 | 1210 |
| 509 | 1211 cl = cl->next; |
| 1212 cl->buf = b; | |
| 1213 | |
| 1214 b = ngx_create_temp_buf(r->pool, | |
| 1215 sizeof(ngx_http_fastcgi_header_t) | |
| 1216 + padding); | |
| 1217 if (b == NULL) { | |
| 1218 return NGX_ERROR; | |
| 1219 } | |
| 479 | 1220 |
| 509 | 1221 if (padding) { |
| 1222 ngx_memzero(b->last, padding); | |
| 1223 b->last += padding; | |
| 1224 } | |
| 1225 | |
| 1226 h = (ngx_http_fastcgi_header_t *) b->last; | |
| 1227 b->last += sizeof(ngx_http_fastcgi_header_t); | |
| 479 | 1228 |
| 509 | 1229 cl->next = ngx_alloc_chain_link(r->pool); |
| 1230 if (cl->next == NULL) { | |
| 1231 return NGX_ERROR; | |
| 1232 } | |
| 1233 | |
| 1234 cl = cl->next; | |
| 1235 cl->buf = b; | |
| 479 | 1236 |
| 509 | 1237 } while (!next); |
| 479 | 1238 |
| 509 | 1239 body = body->next; |
| 1240 } | |
| 479 | 1241 |
| 509 | 1242 } else { |
| 1243 r->upstream->request_bufs = cl; | |
| 479 | 1244 } |
| 1245 | |
| 1246 h->version = 1; | |
| 1247 h->type = NGX_HTTP_FASTCGI_STDIN; | |
| 1248 h->request_id_hi = 0; | |
| 1249 h->request_id_lo = 1; | |
| 1250 h->content_length_hi = 0; | |
| 1251 h->content_length_lo = 0; | |
| 1252 h->padding_length = 0; | |
| 1253 h->reserved = 0; | |
| 1254 | |
| 1255 cl->next = NULL; | |
| 1256 | |
| 1257 return NGX_OK; | |
| 1258 } | |
| 1259 | |
| 1260 | |
| 487 | 1261 static ngx_int_t |
| 1262 ngx_http_fastcgi_reinit_request(ngx_http_request_t *r) | |
| 479 | 1263 { |
| 1264 ngx_http_fastcgi_ctx_t *f; | |
| 1265 | |
| 1266 f = ngx_http_get_module_ctx(r, ngx_http_fastcgi_module); | |
| 1267 | |
| 1268 if (f == NULL) { | |
| 1269 return NGX_OK; | |
| 1270 } | |
| 1271 | |
| 1272 f->state = ngx_http_fastcgi_st_version; | |
| 615 | 1273 f->fastcgi_stdout = 0; |
|
3460
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1274 f->large_stderr = 0; |
| 479 | 1275 |
|
5604
22d485944c20
FastCGI: f->split_parts reset on request start.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5575
diff
changeset
|
1276 if (f->split_parts) { |
|
22d485944c20
FastCGI: f->split_parts reset on request start.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5575
diff
changeset
|
1277 f->split_parts->nelts = 0; |
|
22d485944c20
FastCGI: f->split_parts reset on request start.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5575
diff
changeset
|
1278 } |
|
22d485944c20
FastCGI: f->split_parts reset on request start.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5575
diff
changeset
|
1279 |
|
4615
adcd60233817
Added r->state reset on fastcgi/scgi/uwsgi request start.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4593
diff
changeset
|
1280 r->state = 0; |
|
adcd60233817
Added r->state reset on fastcgi/scgi/uwsgi request start.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4593
diff
changeset
|
1281 |
| 479 | 1282 return NGX_OK; |
| 1283 } | |
| 1284 | |
| 1285 | |
| 507 | 1286 static ngx_int_t |
| 1287 ngx_http_fastcgi_process_header(ngx_http_request_t *r) | |
| 479 | 1288 { |
|
3025
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1289 u_char *p, *msg, *start, *last, |
|
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1290 *part_start, *part_end; |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1291 size_t size; |
|
3025
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1292 ngx_str_t *status_line, *pattern; |
| 509 | 1293 ngx_int_t rc, status; |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1294 ngx_buf_t buf; |
| 649 | 1295 ngx_uint_t i; |
| 509 | 1296 ngx_table_elt_t *h; |
| 1297 ngx_http_upstream_t *u; | |
| 1298 ngx_http_fastcgi_ctx_t *f; | |
| 1299 ngx_http_upstream_header_t *hh; | |
| 1228 | 1300 ngx_http_fastcgi_loc_conf_t *flcf; |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1301 ngx_http_fastcgi_split_part_t *part; |
| 509 | 1302 ngx_http_upstream_main_conf_t *umcf; |
| 479 | 1303 |
| 1304 f = ngx_http_get_module_ctx(r, ngx_http_fastcgi_module); | |
| 1305 | |
| 509 | 1306 umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module); |
| 1307 | |
| 479 | 1308 u = r->upstream; |
| 1309 | |
| 1310 for ( ;; ) { | |
| 1311 | |
| 1312 if (f->state < ngx_http_fastcgi_st_data) { | |
| 1313 | |
| 581 | 1314 f->pos = u->buffer.pos; |
| 1315 f->last = u->buffer.last; | |
| 479 | 1316 |
| 1317 rc = ngx_http_fastcgi_process_record(r, f); | |
| 1318 | |
| 581 | 1319 u->buffer.pos = f->pos; |
| 1320 u->buffer.last = f->last; | |
| 479 | 1321 |
| 1322 if (rc == NGX_AGAIN) { | |
| 1323 return NGX_AGAIN; | |
| 1324 } | |
| 1325 | |
| 1326 if (rc == NGX_ERROR) { | |
| 1327 return NGX_HTTP_UPSTREAM_INVALID_HEADER; | |
| 1328 } | |
| 1329 | |
| 491 | 1330 if (f->type != NGX_HTTP_FASTCGI_STDOUT |
| 1331 && f->type != NGX_HTTP_FASTCGI_STDERR) | |
| 1332 { | |
| 479 | 1333 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
| 1334 "upstream sent unexpected FastCGI record: %d", | |
| 1335 f->type); | |
| 1336 | |
| 1337 return NGX_HTTP_UPSTREAM_INVALID_HEADER; | |
| 1338 } | |
| 1339 | |
| 491 | 1340 if (f->type == NGX_HTTP_FASTCGI_STDOUT && f->length == 0) { |
| 479 | 1341 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
4593
834049edae24
Fixed grammar in error messages.
Ruslan Ermilov <ru@nginx.com>
parents:
4529
diff
changeset
|
1342 "upstream prematurely closed FastCGI stdout"); |
| 479 | 1343 |
| 1344 return NGX_HTTP_UPSTREAM_INVALID_HEADER; | |
| 1345 } | |
| 1346 } | |
| 1347 | |
| 1348 if (f->state == ngx_http_fastcgi_st_padding) { | |
| 1349 | |
| 581 | 1350 if (u->buffer.pos + f->padding < u->buffer.last) { |
| 479 | 1351 f->state = ngx_http_fastcgi_st_version; |
| 581 | 1352 u->buffer.pos += f->padding; |
| 479 | 1353 |
| 1354 continue; | |
| 1355 } | |
| 1356 | |
| 581 | 1357 if (u->buffer.pos + f->padding == u->buffer.last) { |
| 479 | 1358 f->state = ngx_http_fastcgi_st_version; |
| 581 | 1359 u->buffer.pos = u->buffer.last; |
| 479 | 1360 |
| 1361 return NGX_AGAIN; | |
| 1362 } | |
| 1363 | |
| 581 | 1364 f->padding -= u->buffer.last - u->buffer.pos; |
| 1365 u->buffer.pos = u->buffer.last; | |
| 479 | 1366 |
| 1367 return NGX_AGAIN; | |
| 1368 } | |
| 1369 | |
| 491 | 1370 |
| 479 | 1371 /* f->state == ngx_http_fastcgi_st_data */ |
| 1372 | |
| 491 | 1373 if (f->type == NGX_HTTP_FASTCGI_STDERR) { |
| 1374 | |
| 1375 if (f->length) { | |
|
3025
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1376 msg = u->buffer.pos; |
| 491 | 1377 |
| 581 | 1378 if (u->buffer.pos + f->length <= u->buffer.last) { |
| 1379 u->buffer.pos += f->length; | |
| 491 | 1380 f->length = 0; |
| 1381 f->state = ngx_http_fastcgi_st_padding; | |
| 1382 | |
| 577 | 1383 } else { |
| 581 | 1384 f->length -= u->buffer.last - u->buffer.pos; |
| 1385 u->buffer.pos = u->buffer.last; | |
| 491 | 1386 } |
| 1387 | |
|
3025
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1388 for (p = u->buffer.pos - 1; msg < p; p--) { |
|
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1389 if (*p != LF && *p != CR && *p != '.' && *p != ' ') { |
|
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1390 break; |
|
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1391 } |
| 491 | 1392 } |
| 1393 | |
|
3025
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1394 p++; |
|
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1395 |
| 491 | 1396 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
3025
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1397 "FastCGI sent in stderr: \"%*s\"", p - msg, msg); |
| 491 | 1398 |
| 1228 | 1399 flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module); |
| 1400 | |
| 1401 if (flcf->catch_stderr) { | |
| 1402 pattern = flcf->catch_stderr->elts; | |
| 1403 | |
| 1404 for (i = 0; i < flcf->catch_stderr->nelts; i++) { | |
|
3025
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1405 if (ngx_strnstr(msg, (char *) pattern[i].data, |
|
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1406 p - msg) |
|
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1407 != NULL) |
|
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1408 { |
|
1700
7f3350b18e75
return NGX_HTTP_UPSTREAM_INVALID_HEADER instead of NGX_HTTP_BAD_GATEWAY
Igor Sysoev <igor@sysoev.ru>
parents:
1699
diff
changeset
|
1409 return NGX_HTTP_UPSTREAM_INVALID_HEADER; |
| 1228 | 1410 } |
| 1411 } | |
| 1412 } | |
| 1413 | |
| 581 | 1414 if (u->buffer.pos == u->buffer.last) { |
| 615 | 1415 |
| 1416 if (!f->fastcgi_stdout) { | |
| 1417 | |
| 1418 /* | |
| 1419 * the special handling the large number | |
| 1420 * of the PHP warnings to not allocate memory | |
| 1421 */ | |
| 1422 | |
|
3460
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1423 #if (NGX_HTTP_CACHE) |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1424 if (r->cache) { |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1425 u->buffer.pos = u->buffer.start |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1426 + r->cache->header_start; |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1427 } else { |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1428 u->buffer.pos = u->buffer.start; |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1429 } |
|
3850
ca7b9caa20e5
fix large stderr handling without http cache
Igor Sysoev <igor@sysoev.ru>
parents:
3735
diff
changeset
|
1430 #else |
|
ca7b9caa20e5
fix large stderr handling without http cache
Igor Sysoev <igor@sysoev.ru>
parents:
3735
diff
changeset
|
1431 u->buffer.pos = u->buffer.start; |
|
3460
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1432 #endif |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1433 u->buffer.last = u->buffer.pos; |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1434 f->large_stderr = 1; |
| 615 | 1435 } |
| 1436 | |
| 491 | 1437 return NGX_AGAIN; |
| 1438 } | |
| 1439 | |
| 1440 } else { | |
|
5027
2ab25df19dc6
FastCGI: unconditional state transitions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5026
diff
changeset
|
1441 f->state = ngx_http_fastcgi_st_padding; |
| 491 | 1442 } |
| 1443 | |
| 1444 continue; | |
| 1445 } | |
| 1446 | |
| 1447 | |
| 1448 /* f->type == NGX_HTTP_FASTCGI_STDOUT */ | |
| 1449 | |
|
3460
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1450 #if (NGX_HTTP_CACHE) |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1451 |
|
3469
08a66ba99191
fix segfault if there was non cached large FastCGI stderr output before header,
Igor Sysoev <igor@sysoev.ru>
parents:
3460
diff
changeset
|
1452 if (f->large_stderr && r->cache) { |
|
3494
67b8a4e0d7e1
fix building without HTTP cache, the bug had been introduced in r3461
Igor Sysoev <igor@sysoev.ru>
parents:
3469
diff
changeset
|
1453 u_char *start; |
|
67b8a4e0d7e1
fix building without HTTP cache, the bug had been introduced in r3461
Igor Sysoev <igor@sysoev.ru>
parents:
3469
diff
changeset
|
1454 ssize_t len; |
|
67b8a4e0d7e1
fix building without HTTP cache, the bug had been introduced in r3461
Igor Sysoev <igor@sysoev.ru>
parents:
3469
diff
changeset
|
1455 ngx_http_fastcgi_header_t *fh; |
|
3460
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1456 |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1457 start = u->buffer.start + r->cache->header_start; |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1458 |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1459 len = u->buffer.pos - start - 2 * sizeof(ngx_http_fastcgi_header_t); |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1460 |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1461 /* |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1462 * A tail of large stderr output before HTTP header is placed |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1463 * in a cache file without a FastCGI record header. |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1464 * To workaround it we put a dummy FastCGI record header at the |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1465 * start of the stderr output or update r->cache_header_start, |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1466 * if there is no enough place for the record header. |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1467 */ |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1468 |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1469 if (len >= 0) { |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1470 fh = (ngx_http_fastcgi_header_t *) start; |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1471 fh->version = 1; |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1472 fh->type = NGX_HTTP_FASTCGI_STDERR; |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1473 fh->request_id_hi = 0; |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1474 fh->request_id_lo = 1; |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1475 fh->content_length_hi = (u_char) ((len >> 8) & 0xff); |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1476 fh->content_length_lo = (u_char) (len & 0xff); |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1477 fh->padding_length = 0; |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1478 fh->reserved = 0; |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1479 |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1480 } else { |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1481 r->cache->header_start += u->buffer.pos - start |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1482 - sizeof(ngx_http_fastcgi_header_t); |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1483 } |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1484 |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1485 f->large_stderr = 0; |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1486 } |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1487 |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1488 #endif |
|
bbea0b19b608
fix cached FastCGI response with large stderr output before header
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
1489 |
| 615 | 1490 f->fastcgi_stdout = 1; |
| 1491 | |
| 581 | 1492 start = u->buffer.pos; |
| 479 | 1493 |
| 581 | 1494 if (u->buffer.pos + f->length < u->buffer.last) { |
| 479 | 1495 |
| 1496 /* | |
| 581 | 1497 * set u->buffer.last to the end of the FastCGI record data |
| 479 | 1498 * for ngx_http_parse_header_line() |
| 1499 */ | |
| 1500 | |
| 581 | 1501 last = u->buffer.last; |
| 1502 u->buffer.last = u->buffer.pos + f->length; | |
| 479 | 1503 |
| 1504 } else { | |
| 1505 last = NULL; | |
| 1506 } | |
| 1507 | |
| 1508 for ( ;; ) { | |
| 1509 | |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1510 part_start = u->buffer.pos; |
|
3011
5957e869f04d
fix a garbage in a split fastcgi header
Igor Sysoev <igor@sysoev.ru>
parents:
3010
diff
changeset
|
1511 part_end = u->buffer.last; |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1512 |
| 2256 | 1513 rc = ngx_http_parse_header_line(r, &u->buffer, 1); |
| 479 | 1514 |
| 1515 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 1516 "http fastcgi parser: %d", rc); | |
| 1517 | |
| 1518 if (rc == NGX_AGAIN) { | |
| 1519 break; | |
| 1520 } | |
| 1521 | |
| 1522 if (rc == NGX_OK) { | |
| 1523 | |
| 1524 /* a header line has been parsed successfully */ | |
| 1525 | |
| 509 | 1526 h = ngx_list_push(&u->headers_in.headers); |
| 501 | 1527 if (h == NULL) { |
|
1699
976db8c6fb64
return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR in u->parse_header()
Igor Sysoev <igor@sysoev.ru>
parents:
1698
diff
changeset
|
1528 return NGX_ERROR; |
| 479 | 1529 } |
| 1530 | |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1531 if (f->split_parts && f->split_parts->nelts) { |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1532 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1533 part = f->split_parts->elts; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1534 size = u->buffer.pos - part_start; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1535 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1536 for (i = 0; i < f->split_parts->nelts; i++) { |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1537 size += part[i].end - part[i].start; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1538 } |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1539 |
| 2049 | 1540 p = ngx_pnalloc(r->pool, size); |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1541 if (p == NULL) { |
|
1699
976db8c6fb64
return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR in u->parse_header()
Igor Sysoev <igor@sysoev.ru>
parents:
1698
diff
changeset
|
1542 return NGX_ERROR; |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1543 } |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1544 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1545 buf.pos = p; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1546 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1547 for (i = 0; i < f->split_parts->nelts; i++) { |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1548 p = ngx_cpymem(p, part[i].start, |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1549 part[i].end - part[i].start); |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1550 } |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1551 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1552 p = ngx_cpymem(p, part_start, u->buffer.pos - part_start); |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1553 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1554 buf.last = p; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1555 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1556 f->split_parts->nelts = 0; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1557 |
| 2256 | 1558 rc = ngx_http_parse_header_line(r, &buf, 1); |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1559 |
|
5604
22d485944c20
FastCGI: f->split_parts reset on request start.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5575
diff
changeset
|
1560 if (rc != NGX_OK) { |
|
22d485944c20
FastCGI: f->split_parts reset on request start.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5575
diff
changeset
|
1561 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, |
|
22d485944c20
FastCGI: f->split_parts reset on request start.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5575
diff
changeset
|
1562 "invalid header after joining " |
|
22d485944c20
FastCGI: f->split_parts reset on request start.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5575
diff
changeset
|
1563 "FastCGI records"); |
|
22d485944c20
FastCGI: f->split_parts reset on request start.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5575
diff
changeset
|
1564 return NGX_ERROR; |
|
22d485944c20
FastCGI: f->split_parts reset on request start.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5575
diff
changeset
|
1565 } |
|
22d485944c20
FastCGI: f->split_parts reset on request start.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5575
diff
changeset
|
1566 |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1567 h->key.len = r->header_name_end - r->header_name_start; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1568 h->key.data = r->header_name_start; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1569 h->key.data[h->key.len] = '\0'; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1570 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1571 h->value.len = r->header_end - r->header_start; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1572 h->value.data = r->header_start; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1573 h->value.data[h->value.len] = '\0'; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1574 |
| 2049 | 1575 h->lowcase_key = ngx_pnalloc(r->pool, h->key.len); |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1576 if (h->lowcase_key == NULL) { |
|
1699
976db8c6fb64
return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR in u->parse_header()
Igor Sysoev <igor@sysoev.ru>
parents:
1698
diff
changeset
|
1577 return NGX_ERROR; |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1578 } |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1579 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1580 } else { |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1581 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1582 h->key.len = r->header_name_end - r->header_name_start; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1583 h->value.len = r->header_end - r->header_start; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1584 |
| 2049 | 1585 h->key.data = ngx_pnalloc(r->pool, |
| 1586 h->key.len + 1 + h->value.len + 1 | |
| 1587 + h->key.len); | |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1588 if (h->key.data == NULL) { |
|
1699
976db8c6fb64
return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR in u->parse_header()
Igor Sysoev <igor@sysoev.ru>
parents:
1698
diff
changeset
|
1589 return NGX_ERROR; |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1590 } |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1591 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1592 h->value.data = h->key.data + h->key.len + 1; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1593 h->lowcase_key = h->key.data + h->key.len + 1 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1594 + h->value.len + 1; |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1595 |
|
4529
1ebec1d15a25
Fixed incorrect ngx_cpystrn() usage in ngx_http_*_process_header().
Maxim Dounin <mdounin@mdounin.ru>
parents:
4522
diff
changeset
|
1596 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
|
1597 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
|
1598 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
|
1599 h->value.data[h->value.len] = '\0'; |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1600 } |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1601 |
| 509 | 1602 h->hash = r->header_hash; |
| 1603 | |
| 649 | 1604 if (h->key.len == r->lowcase_index) { |
| 1605 ngx_memcpy(h->lowcase_key, r->lowcase_header, h->key.len); | |
| 1606 | |
| 1607 } else { | |
| 2135 | 1608 ngx_strlow(h->lowcase_key, h->key.data, h->key.len); |
| 479 | 1609 } |
| 1610 | |
| 649 | 1611 hh = ngx_hash_find(&umcf->headers_in_hash, h->hash, |
| 1612 h->lowcase_key, h->key.len); | |
| 1613 | |
| 1614 if (hh && hh->handler(r, h, hh->offset) != NGX_OK) { | |
|
1699
976db8c6fb64
return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR in u->parse_header()
Igor Sysoev <igor@sysoev.ru>
parents:
1698
diff
changeset
|
1615 return NGX_ERROR; |
| 649 | 1616 } |
| 1617 | |
| 479 | 1618 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
| 1619 "http fastcgi header: \"%V: %V\"", | |
| 1620 &h->key, &h->value); | |
| 1621 | |
| 615 | 1622 if (u->buffer.pos < u->buffer.last) { |
| 1623 continue; | |
| 1624 } | |
| 1625 | |
| 1626 /* the end of the FastCGI record */ | |
| 1627 | |
| 1628 break; | |
| 479 | 1629 } |
| 1630 | |
| 1631 if (rc == NGX_HTTP_PARSE_HEADER_DONE) { | |
| 1632 | |
| 1633 /* a whole header has been parsed successfully */ | |
| 1634 | |
| 1635 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 1636 "http fastcgi header done"); | |
| 1637 | |
| 509 | 1638 if (u->headers_in.status) { |
| 1639 status_line = &u->headers_in.status->value; | |
| 479 | 1640 |
| 1641 status = ngx_atoi(status_line->data, 3); | |
| 1642 | |
| 1643 if (status == NGX_ERROR) { | |
|
1698
70202cd85645
return NGX_HTTP_UPSTREAM_INVALID_HEADER for invalid status
Igor Sysoev <igor@sysoev.ru>
parents:
1678
diff
changeset
|
1644 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
70202cd85645
return NGX_HTTP_UPSTREAM_INVALID_HEADER for invalid status
Igor Sysoev <igor@sysoev.ru>
parents:
1678
diff
changeset
|
1645 "upstream sent invalid status \"%V\"", |
|
70202cd85645
return NGX_HTTP_UPSTREAM_INVALID_HEADER for invalid status
Igor Sysoev <igor@sysoev.ru>
parents:
1678
diff
changeset
|
1646 status_line); |
|
70202cd85645
return NGX_HTTP_UPSTREAM_INVALID_HEADER for invalid status
Igor Sysoev <igor@sysoev.ru>
parents:
1678
diff
changeset
|
1647 return NGX_HTTP_UPSTREAM_INVALID_HEADER; |
| 479 | 1648 } |
| 1649 | |
| 529 | 1650 u->headers_in.status_n = status; |
| 1651 u->headers_in.status_line = *status_line; | |
| 479 | 1652 |
|
2140
dce5ddef5af9
if upstream sent a location header without status use 302
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
1653 } else if (u->headers_in.location) { |
|
dce5ddef5af9
if upstream sent a location header without status use 302
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
1654 u->headers_in.status_n = 302; |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3494
diff
changeset
|
1655 ngx_str_set(&u->headers_in.status_line, |
|
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3494
diff
changeset
|
1656 "302 Moved Temporarily"); |
|
2140
dce5ddef5af9
if upstream sent a location header without status use 302
Igor Sysoev <igor@sysoev.ru>
parents:
2135
diff
changeset
|
1657 |
| 479 | 1658 } else { |
| 529 | 1659 u->headers_in.status_n = 200; |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3494
diff
changeset
|
1660 ngx_str_set(&u->headers_in.status_line, "200 OK"); |
| 479 | 1661 } |
| 1662 | |
|
5575
d15822784cf9
Upstream: fix $upstream_status variable.
Piotr Sikora <piotr@cloudflare.com>
parents:
5466
diff
changeset
|
1663 if (u->state && u->state->status == 0) { |
| 2602 | 1664 u->state->status = u->headers_in.status_n; |
| 479 | 1665 } |
| 1666 | |
| 1667 break; | |
| 1668 } | |
| 1669 | |
| 1670 /* there was error while a header line parsing */ | |
| 1671 | |
| 1672 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 619 | 1673 "upstream sent invalid header"); |
| 479 | 1674 |
| 1675 return NGX_HTTP_UPSTREAM_INVALID_HEADER; | |
| 1676 } | |
| 1677 | |
| 1678 if (last) { | |
| 581 | 1679 u->buffer.last = last; |
| 479 | 1680 } |
| 1681 | |
| 581 | 1682 f->length -= u->buffer.pos - start; |
| 479 | 1683 |
| 1684 if (f->length == 0) { | |
|
5027
2ab25df19dc6
FastCGI: unconditional state transitions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5026
diff
changeset
|
1685 f->state = ngx_http_fastcgi_st_padding; |
| 479 | 1686 } |
| 1687 | |
| 615 | 1688 if (rc == NGX_HTTP_PARSE_HEADER_DONE) { |
| 1689 return NGX_OK; | |
| 1690 } | |
| 1691 | |
| 1274 | 1692 if (rc == NGX_OK) { |
|
1998
63c60504c0bf
fix error introduced in r1273 and r1275:
Igor Sysoev <igor@sysoev.ru>
parents:
1945
diff
changeset
|
1693 continue; |
| 615 | 1694 } |
| 1695 | |
| 1274 | 1696 /* rc == NGX_AGAIN */ |
| 1697 | |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1698 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1699 "upstream split a header line in FastCGI records"); |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1700 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1701 if (f->split_parts == NULL) { |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1702 f->split_parts = ngx_array_create(r->pool, 1, |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1703 sizeof(ngx_http_fastcgi_split_part_t)); |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1704 if (f->split_parts == NULL) { |
|
1699
976db8c6fb64
return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR in u->parse_header()
Igor Sysoev <igor@sysoev.ru>
parents:
1698
diff
changeset
|
1705 return NGX_ERROR; |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1706 } |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1707 } |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1708 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1709 part = ngx_array_push(f->split_parts); |
|
4811
21d1e3bcb356
Added three missing checks for NULL after ngx_array_push() calls.
Valentin Bartenev <vbart@nginx.com>
parents:
4616
diff
changeset
|
1710 if (part == NULL) { |
|
21d1e3bcb356
Added three missing checks for NULL after ngx_array_push() calls.
Valentin Bartenev <vbart@nginx.com>
parents:
4616
diff
changeset
|
1711 return NGX_ERROR; |
|
21d1e3bcb356
Added three missing checks for NULL after ngx_array_push() calls.
Valentin Bartenev <vbart@nginx.com>
parents:
4616
diff
changeset
|
1712 } |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1713 |
|
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1714 part->start = part_start; |
|
3011
5957e869f04d
fix a garbage in a split fastcgi header
Igor Sysoev <igor@sysoev.ru>
parents:
3010
diff
changeset
|
1715 part->end = part_end; |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1716 |
|
3010
37400c84396e
continue to parse available fastcgi record after a split header,
Igor Sysoev <igor@sysoev.ru>
parents:
3006
diff
changeset
|
1717 if (u->buffer.pos < u->buffer.last) { |
|
37400c84396e
continue to parse available fastcgi record after a split header,
Igor Sysoev <igor@sysoev.ru>
parents:
3006
diff
changeset
|
1718 continue; |
|
37400c84396e
continue to parse available fastcgi record after a split header,
Igor Sysoev <igor@sysoev.ru>
parents:
3006
diff
changeset
|
1719 } |
|
37400c84396e
continue to parse available fastcgi record after a split header,
Igor Sysoev <igor@sysoev.ru>
parents:
3006
diff
changeset
|
1720 |
|
1276
1494a23b1ed4
fix headers split in FastCGI records
Igor Sysoev <igor@sysoev.ru>
parents:
1274
diff
changeset
|
1721 return NGX_AGAIN; |
| 479 | 1722 } |
| 1723 } | |
| 1724 | |
| 1725 | |
| 487 | 1726 static ngx_int_t |
|
4122
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1727 ngx_http_fastcgi_input_filter_init(void *data) |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1728 { |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1729 ngx_http_request_t *r = data; |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1730 ngx_http_fastcgi_loc_conf_t *flcf; |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1731 |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1732 flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module); |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1733 |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1734 r->upstream->pipe->length = flcf->keep_conn ? |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1735 (off_t) sizeof(ngx_http_fastcgi_header_t) : -1; |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1736 |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1737 return NGX_OK; |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1738 } |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1739 |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1740 |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1741 static ngx_int_t |
| 487 | 1742 ngx_http_fastcgi_input_filter(ngx_event_pipe_t *p, ngx_buf_t *buf) |
| 479 | 1743 { |
|
4122
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1744 u_char *m, *msg; |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1745 ngx_int_t rc; |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1746 ngx_buf_t *b, **prev; |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1747 ngx_chain_t *cl; |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1748 ngx_http_request_t *r; |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1749 ngx_http_fastcgi_ctx_t *f; |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1750 ngx_http_fastcgi_loc_conf_t *flcf; |
| 479 | 1751 |
| 1752 if (buf->pos == buf->last) { | |
| 1753 return NGX_OK; | |
| 1754 } | |
| 1755 | |
| 1756 r = p->input_ctx; | |
| 1757 f = ngx_http_get_module_ctx(r, ngx_http_fastcgi_module); | |
|
4122
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1758 flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module); |
| 479 | 1759 |
| 1760 b = NULL; | |
| 483 | 1761 prev = &buf->shadow; |
| 479 | 1762 |
| 1763 f->pos = buf->pos; | |
| 1764 f->last = buf->last; | |
| 1765 | |
| 1766 for ( ;; ) { | |
| 1767 if (f->state < ngx_http_fastcgi_st_data) { | |
| 1768 | |
| 1769 rc = ngx_http_fastcgi_process_record(r, f); | |
| 1770 | |
| 1771 if (rc == NGX_AGAIN) { | |
| 1772 break; | |
| 1773 } | |
| 1774 | |
| 1775 if (rc == NGX_ERROR) { | |
| 1776 return NGX_ERROR; | |
| 1777 } | |
| 1778 | |
| 1779 if (f->type == NGX_HTTP_FASTCGI_STDOUT && f->length == 0) { | |
|
5027
2ab25df19dc6
FastCGI: unconditional state transitions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5026
diff
changeset
|
1780 f->state = ngx_http_fastcgi_st_padding; |
|
4122
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1781 |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1782 if (!flcf->keep_conn) { |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1783 p->upstream_done = 1; |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1784 } |
| 479 | 1785 |
| 1786 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, p->log, 0, | |
| 1787 "http fastcgi closed stdout"); | |
| 1788 | |
| 1789 continue; | |
| 1790 } | |
| 1791 | |
| 1792 if (f->type == NGX_HTTP_FASTCGI_END_REQUEST) { | |
|
4122
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1793 |
| 479 | 1794 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, p->log, 0, |
| 1795 "http fastcgi sent end request"); | |
| 1796 | |
|
5028
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1797 if (!flcf->keep_conn) { |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1798 p->upstream_done = 1; |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1799 break; |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1800 } |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1801 |
|
5027
2ab25df19dc6
FastCGI: unconditional state transitions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5026
diff
changeset
|
1802 continue; |
| 479 | 1803 } |
| 1804 } | |
| 1805 | |
| 1806 | |
| 1807 if (f->state == ngx_http_fastcgi_st_padding) { | |
| 1808 | |
|
5028
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1809 if (f->type == NGX_HTTP_FASTCGI_END_REQUEST) { |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1810 |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1811 if (f->pos + f->padding < f->last) { |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1812 p->upstream_done = 1; |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1813 break; |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1814 } |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1815 |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1816 if (f->pos + f->padding == f->last) { |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1817 p->upstream_done = 1; |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1818 r->upstream->keepalive = 1; |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1819 break; |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1820 } |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1821 |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1822 f->padding -= f->last - f->pos; |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1823 |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1824 break; |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1825 } |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1826 |
| 479 | 1827 if (f->pos + f->padding < f->last) { |
| 1828 f->state = ngx_http_fastcgi_st_version; | |
| 1829 f->pos += f->padding; | |
| 1830 | |
| 1831 continue; | |
| 1832 } | |
| 1833 | |
| 1834 if (f->pos + f->padding == f->last) { | |
| 1835 f->state = ngx_http_fastcgi_st_version; | |
| 1836 | |
| 1837 break; | |
| 1838 } | |
| 1839 | |
| 1840 f->padding -= f->last - f->pos; | |
| 1841 | |
| 1842 break; | |
| 1843 } | |
| 1844 | |
| 1845 | |
| 1846 /* f->state == ngx_http_fastcgi_st_data */ | |
| 1847 | |
| 1848 if (f->type == NGX_HTTP_FASTCGI_STDERR) { | |
| 1849 | |
| 1850 if (f->length) { | |
| 639 | 1851 |
| 1852 if (f->pos == f->last) { | |
| 1853 break; | |
| 1854 } | |
| 1855 | |
|
3025
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1856 msg = f->pos; |
| 479 | 1857 |
| 1858 if (f->pos + f->length <= f->last) { | |
| 1859 f->pos += f->length; | |
| 491 | 1860 f->length = 0; |
| 1861 f->state = ngx_http_fastcgi_st_padding; | |
| 479 | 1862 |
| 577 | 1863 } else { |
| 479 | 1864 f->length -= f->last - f->pos; |
| 1865 f->pos = f->last; | |
| 1866 } | |
| 1867 | |
|
3025
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1868 for (m = f->pos - 1; msg < m; m--) { |
|
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1869 if (*m != LF && *m != CR && *m != '.' && *m != ' ') { |
|
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1870 break; |
|
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1871 } |
| 491 | 1872 } |
| 479 | 1873 |
| 1874 ngx_log_error(NGX_LOG_ERR, p->log, 0, | |
|
3025
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1875 "FastCGI sent in stderr: \"%*s\"", |
|
baff3edcb6e2
refactor fastcgi stderr handling
Igor Sysoev <igor@sysoev.ru>
parents:
3011
diff
changeset
|
1876 m + 1 - msg, msg); |
| 479 | 1877 |
| 491 | 1878 } else { |
|
5027
2ab25df19dc6
FastCGI: unconditional state transitions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5026
diff
changeset
|
1879 f->state = ngx_http_fastcgi_st_padding; |
| 479 | 1880 } |
| 1881 | |
| 1882 continue; | |
| 1883 } | |
| 1884 | |
|
5028
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1885 if (f->type == NGX_HTTP_FASTCGI_END_REQUEST) { |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1886 |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1887 if (f->pos + f->length <= f->last) { |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1888 f->state = ngx_http_fastcgi_st_padding; |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1889 f->pos += f->length; |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1890 |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1891 continue; |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1892 } |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1893 |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1894 f->length -= f->last - f->pos; |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1895 |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1896 break; |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1897 } |
|
44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5027
diff
changeset
|
1898 |
| 479 | 1899 |
| 1900 /* f->type == NGX_HTTP_FASTCGI_STDOUT */ | |
| 1901 | |
| 639 | 1902 if (f->pos == f->last) { |
| 1903 break; | |
| 1904 } | |
| 1905 | |
|
5466
e7b3b9855be8
Use ngx_chain_get_free_buf() in pipe input filters.
Valentin Bartenev <vbart@nginx.com>
parents:
5451
diff
changeset
|
1906 cl = ngx_chain_get_free_buf(p->pool, &p->free); |
|
e7b3b9855be8
Use ngx_chain_get_free_buf() in pipe input filters.
Valentin Bartenev <vbart@nginx.com>
parents:
5451
diff
changeset
|
1907 if (cl == NULL) { |
|
e7b3b9855be8
Use ngx_chain_get_free_buf() in pipe input filters.
Valentin Bartenev <vbart@nginx.com>
parents:
5451
diff
changeset
|
1908 return NGX_ERROR; |
| 479 | 1909 } |
| 1910 | |
|
5466
e7b3b9855be8
Use ngx_chain_get_free_buf() in pipe input filters.
Valentin Bartenev <vbart@nginx.com>
parents:
5451
diff
changeset
|
1911 b = cl->buf; |
|
e7b3b9855be8
Use ngx_chain_get_free_buf() in pipe input filters.
Valentin Bartenev <vbart@nginx.com>
parents:
5451
diff
changeset
|
1912 |
| 479 | 1913 ngx_memzero(b, sizeof(ngx_buf_t)); |
| 1914 | |
| 1915 b->pos = f->pos; | |
| 483 | 1916 b->start = buf->start; |
| 1917 b->end = buf->end; | |
| 479 | 1918 b->tag = p->tag; |
| 1919 b->temporary = 1; | |
| 1920 b->recycled = 1; | |
| 483 | 1921 |
| 1922 *prev = b; | |
| 1923 prev = &b->shadow; | |
| 479 | 1924 |
| 501 | 1925 if (p->in) { |
| 1926 *p->last_in = cl; | |
| 1927 } else { | |
| 1928 p->in = cl; | |
| 1929 } | |
| 1930 p->last_in = &cl->next; | |
| 1931 | |
| 1932 | |
| 483 | 1933 /* STUB */ b->num = buf->num; |
| 1934 | |
|
1030
5a86fcc480c6
add debug logging for FastCGI zero size buf alert
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
1935 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, p->log, 0, |
| 1037 | 1936 "input buf #%d %p", b->num, b->pos); |
| 479 | 1937 |
|
5027
2ab25df19dc6
FastCGI: unconditional state transitions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5026
diff
changeset
|
1938 if (f->pos + f->length <= f->last) { |
|
2ab25df19dc6
FastCGI: unconditional state transitions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5026
diff
changeset
|
1939 f->state = ngx_http_fastcgi_st_padding; |
| 479 | 1940 f->pos += f->length; |
| 1941 b->last = f->pos; | |
| 1942 | |
| 1943 continue; | |
| 1944 } | |
| 1945 | |
| 1946 f->length -= f->last - f->pos; | |
| 1947 | |
| 1948 b->last = f->last; | |
| 1949 | |
| 1950 break; | |
| 1951 | |
| 1952 } | |
| 1953 | |
|
4122
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1954 if (flcf->keep_conn) { |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1955 |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1956 /* set p->length, minimal amount of data we want to see */ |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1957 |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1958 if (f->state < ngx_http_fastcgi_st_data) { |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1959 p->length = 1; |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1960 |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1961 } else if (f->state == ngx_http_fastcgi_st_padding) { |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1962 p->length = f->padding; |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1963 |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1964 } else { |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1965 /* ngx_http_fastcgi_st_data */ |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1966 |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1967 p->length = f->length; |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1968 } |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1969 } |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
1970 |
| 479 | 1971 if (b) { |
| 483 | 1972 b->shadow = buf; |
| 479 | 1973 b->last_shadow = 1; |
| 483 | 1974 |
|
1030
5a86fcc480c6
add debug logging for FastCGI zero size buf alert
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
1975 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, p->log, 0, |
| 1037 | 1976 "input buf %p %z", b->pos, b->last - b->pos); |
|
1030
5a86fcc480c6
add debug logging for FastCGI zero size buf alert
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
1977 |
| 483 | 1978 return NGX_OK; |
| 1979 } | |
| 1980 | |
| 1981 /* there is no data record in the buf, add it to free chain */ | |
| 1982 | |
| 1983 if (ngx_event_pipe_add_free_buf(p, buf) != NGX_OK) { | |
| 1984 return NGX_ERROR; | |
| 479 | 1985 } |
| 1986 | |
| 1987 return NGX_OK; | |
| 1988 } | |
| 1989 | |
| 1990 | |
| 487 | 1991 static ngx_int_t |
|
5394
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
1992 ngx_http_fastcgi_non_buffered_filter(void *data, ssize_t bytes) |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
1993 { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
1994 u_char *m, *msg; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
1995 ngx_int_t rc; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
1996 ngx_buf_t *b, *buf; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
1997 ngx_chain_t *cl, **ll; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
1998 ngx_http_request_t *r; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
1999 ngx_http_upstream_t *u; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2000 ngx_http_fastcgi_ctx_t *f; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2001 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2002 r = data; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2003 f = ngx_http_get_module_ctx(r, ngx_http_fastcgi_module); |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2004 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2005 u = r->upstream; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2006 buf = &u->buffer; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2007 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2008 buf->pos = buf->last; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2009 buf->last += bytes; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2010 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2011 for (cl = u->out_bufs, ll = &u->out_bufs; cl; cl = cl->next) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2012 ll = &cl->next; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2013 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2014 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2015 f->pos = buf->pos; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2016 f->last = buf->last; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2017 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2018 for ( ;; ) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2019 if (f->state < ngx_http_fastcgi_st_data) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2020 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2021 rc = ngx_http_fastcgi_process_record(r, f); |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2022 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2023 if (rc == NGX_AGAIN) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2024 break; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2025 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2026 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2027 if (rc == NGX_ERROR) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2028 return NGX_ERROR; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2029 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2030 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2031 if (f->type == NGX_HTTP_FASTCGI_STDOUT && f->length == 0) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2032 f->state = ngx_http_fastcgi_st_padding; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2033 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2034 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2035 "http fastcgi closed stdout"); |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2036 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2037 continue; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2038 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2039 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2040 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2041 if (f->state == ngx_http_fastcgi_st_padding) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2042 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2043 if (f->type == NGX_HTTP_FASTCGI_END_REQUEST) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2044 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2045 if (f->pos + f->padding < f->last) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2046 u->length = 0; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2047 break; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2048 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2049 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2050 if (f->pos + f->padding == f->last) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2051 u->length = 0; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2052 u->keepalive = 1; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2053 break; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2054 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2055 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2056 f->padding -= f->last - f->pos; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2057 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2058 break; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2059 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2060 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2061 if (f->pos + f->padding < f->last) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2062 f->state = ngx_http_fastcgi_st_version; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2063 f->pos += f->padding; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2064 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2065 continue; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2066 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2067 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2068 if (f->pos + f->padding == f->last) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2069 f->state = ngx_http_fastcgi_st_version; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2070 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2071 break; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2072 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2073 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2074 f->padding -= f->last - f->pos; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2075 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2076 break; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2077 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2078 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2079 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2080 /* f->state == ngx_http_fastcgi_st_data */ |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2081 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2082 if (f->type == NGX_HTTP_FASTCGI_STDERR) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2083 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2084 if (f->length) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2085 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2086 if (f->pos == f->last) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2087 break; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2088 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2089 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2090 msg = f->pos; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2091 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2092 if (f->pos + f->length <= f->last) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2093 f->pos += f->length; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2094 f->length = 0; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2095 f->state = ngx_http_fastcgi_st_padding; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2096 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2097 } else { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2098 f->length -= f->last - f->pos; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2099 f->pos = f->last; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2100 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2101 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2102 for (m = f->pos - 1; msg < m; m--) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2103 if (*m != LF && *m != CR && *m != '.' && *m != ' ') { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2104 break; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2105 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2106 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2107 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2108 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2109 "FastCGI sent in stderr: \"%*s\"", |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2110 m + 1 - msg, msg); |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2111 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2112 } else { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2113 f->state = ngx_http_fastcgi_st_padding; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2114 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2115 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2116 continue; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2117 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2118 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2119 if (f->type == NGX_HTTP_FASTCGI_END_REQUEST) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2120 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2121 if (f->pos + f->length <= f->last) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2122 f->state = ngx_http_fastcgi_st_padding; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2123 f->pos += f->length; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2124 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2125 continue; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2126 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2127 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2128 f->length -= f->last - f->pos; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2129 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2130 break; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2131 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2132 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2133 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2134 /* f->type == NGX_HTTP_FASTCGI_STDOUT */ |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2135 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2136 if (f->pos == f->last) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2137 break; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2138 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2139 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2140 cl = ngx_chain_get_free_buf(r->pool, &u->free_bufs); |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2141 if (cl == NULL) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2142 return NGX_ERROR; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2143 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2144 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2145 *ll = cl; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2146 ll = &cl->next; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2147 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2148 b = cl->buf; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2149 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2150 b->flush = 1; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2151 b->memory = 1; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2152 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2153 b->pos = f->pos; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2154 b->tag = u->output.tag; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2155 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2156 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2157 "http fastcgi output buf %p", b->pos); |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2158 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2159 if (f->pos + f->length <= f->last) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2160 f->state = ngx_http_fastcgi_st_padding; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2161 f->pos += f->length; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2162 b->last = f->pos; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2163 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2164 continue; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2165 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2166 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2167 f->length -= f->last - f->pos; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2168 b->last = f->last; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2169 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2170 break; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2171 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2172 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2173 /* provide continuous buffer for subrequests in memory */ |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2174 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2175 if (r->subrequest_in_memory) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2176 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2177 cl = u->out_bufs; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2178 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2179 if (cl) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2180 buf->pos = cl->buf->pos; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2181 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2182 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2183 buf->last = buf->pos; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2184 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2185 for (cl = u->out_bufs; cl; cl = cl->next) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2186 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2187 "http fastcgi in memory %p-%p %uz", |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2188 cl->buf->pos, cl->buf->last, ngx_buf_size(cl->buf)); |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2189 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2190 if (buf->last == cl->buf->pos) { |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2191 buf->last = cl->buf->last; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2192 continue; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2193 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2194 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2195 buf->last = ngx_movemem(buf->last, cl->buf->pos, |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2196 cl->buf->last - cl->buf->pos); |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2197 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2198 cl->buf->pos = buf->last - (cl->buf->last - cl->buf->pos); |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2199 cl->buf->last = buf->last; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2200 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2201 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2202 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2203 return NGX_OK; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2204 } |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2205 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2206 |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2207 static ngx_int_t |
| 487 | 2208 ngx_http_fastcgi_process_record(ngx_http_request_t *r, |
| 2209 ngx_http_fastcgi_ctx_t *f) | |
| 479 | 2210 { |
| 2211 u_char ch, *p; | |
| 2212 ngx_http_fastcgi_state_e state; | |
| 2213 | |
| 2214 state = f->state; | |
| 2215 | |
| 2216 for (p = f->pos; p < f->last; p++) { | |
| 2217 | |
| 2218 ch = *p; | |
| 2219 | |
| 2220 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 2221 "http fastcgi record byte: %02Xd", ch); | |
| 2222 | |
| 2223 switch (state) { | |
| 2224 | |
| 2225 case ngx_http_fastcgi_st_version: | |
| 2226 if (ch != 1) { | |
| 2227 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 2228 "upstream sent unsupported FastCGI " | |
| 2229 "protocol version: %d", ch); | |
| 2230 return NGX_ERROR; | |
| 2231 } | |
| 2232 state = ngx_http_fastcgi_st_type; | |
| 2233 break; | |
| 2234 | |
| 2235 case ngx_http_fastcgi_st_type: | |
| 2236 switch (ch) { | |
| 2237 case NGX_HTTP_FASTCGI_STDOUT: | |
| 2238 case NGX_HTTP_FASTCGI_STDERR: | |
| 2239 case NGX_HTTP_FASTCGI_END_REQUEST: | |
| 2240 f->type = (ngx_uint_t) ch; | |
| 2241 break; | |
| 2242 default: | |
| 2243 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 2244 "upstream sent invalid FastCGI " | |
| 2245 "record type: %d", ch); | |
| 2246 return NGX_ERROR; | |
| 2247 | |
| 2248 } | |
| 2249 state = ngx_http_fastcgi_st_request_id_hi; | |
| 2250 break; | |
| 2251 | |
| 2252 /* we support the single request per connection */ | |
| 2253 | |
| 2254 case ngx_http_fastcgi_st_request_id_hi: | |
| 2255 if (ch != 0) { | |
| 2256 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 2257 "upstream sent unexpected FastCGI " | |
| 2258 "request id high byte: %d", ch); | |
| 2259 return NGX_ERROR; | |
| 2260 } | |
| 2261 state = ngx_http_fastcgi_st_request_id_lo; | |
| 2262 break; | |
| 2263 | |
| 2264 case ngx_http_fastcgi_st_request_id_lo: | |
| 2265 if (ch != 1) { | |
| 2266 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 2267 "upstream sent unexpected FastCGI " | |
| 2268 "request id low byte: %d", ch); | |
| 2269 return NGX_ERROR; | |
| 2270 } | |
| 2271 state = ngx_http_fastcgi_st_content_length_hi; | |
| 2272 break; | |
| 2273 | |
| 2274 case ngx_http_fastcgi_st_content_length_hi: | |
| 2275 f->length = ch << 8; | |
| 2276 state = ngx_http_fastcgi_st_content_length_lo; | |
| 2277 break; | |
| 2278 | |
| 2279 case ngx_http_fastcgi_st_content_length_lo: | |
| 2280 f->length |= (size_t) ch; | |
| 2281 state = ngx_http_fastcgi_st_padding_length; | |
| 2282 break; | |
| 2283 | |
| 2284 case ngx_http_fastcgi_st_padding_length: | |
| 2285 f->padding = (size_t) ch; | |
| 2286 state = ngx_http_fastcgi_st_reserved; | |
| 2287 break; | |
| 2288 | |
| 2289 case ngx_http_fastcgi_st_reserved: | |
| 2290 state = ngx_http_fastcgi_st_data; | |
| 2291 | |
| 2292 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 2293 "http fastcgi record length: %z", f->length); | |
| 2294 | |
| 2295 f->pos = p + 1; | |
| 2296 f->state = state; | |
| 2297 | |
| 2298 return NGX_OK; | |
| 2299 | |
| 2300 /* suppress warning */ | |
| 2301 case ngx_http_fastcgi_st_data: | |
| 2302 case ngx_http_fastcgi_st_padding: | |
| 2303 break; | |
| 2304 } | |
| 2305 } | |
| 2306 | |
| 2307 f->state = state; | |
| 2308 | |
| 2309 return NGX_AGAIN; | |
| 2310 } | |
| 2311 | |
| 2312 | |
| 487 | 2313 static void |
| 2314 ngx_http_fastcgi_abort_request(ngx_http_request_t *r) | |
| 479 | 2315 { |
| 2316 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 2317 "abort http fastcgi request"); | |
| 2318 | |
| 2319 return; | |
| 2320 } | |
| 2321 | |
| 2322 | |
| 487 | 2323 static void |
| 2324 ngx_http_fastcgi_finalize_request(ngx_http_request_t *r, ngx_int_t rc) | |
| 479 | 2325 { |
| 2326 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 2327 "finalize http fastcgi request"); | |
| 2328 | |
| 2329 return; | |
| 2330 } | |
| 2331 | |
| 2332 | |
| 509 | 2333 static ngx_int_t |
| 2334 ngx_http_fastcgi_add_variables(ngx_conf_t *cf) | |
| 479 | 2335 { |
| 2443 | 2336 ngx_http_variable_t *var, *v; |
| 2337 | |
| 2338 for (v = ngx_http_fastcgi_vars; v->name.len; v++) { | |
| 2339 var = ngx_http_add_variable(cf, &v->name, v->flags); | |
| 2340 if (var == NULL) { | |
| 2341 return NGX_ERROR; | |
| 2342 } | |
| 2343 | |
| 2344 var->get_handler = v->get_handler; | |
| 2345 var->data = v->data; | |
| 479 | 2346 } |
| 2347 | |
| 509 | 2348 return NGX_OK; |
| 479 | 2349 } |
| 2350 | |
| 2351 | |
| 487 | 2352 static void * |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2353 ngx_http_fastcgi_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
|
2354 { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2355 ngx_http_fastcgi_main_conf_t *conf; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2356 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2357 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_fastcgi_main_conf_t)); |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2358 if (conf == NULL) { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2359 return NULL; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2360 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2361 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2362 #if (NGX_HTTP_CACHE) |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2363 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
|
2364 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
|
2365 != NGX_OK) |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2366 { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2367 return NULL; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2368 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2369 #endif |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2370 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2371 return conf; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2372 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2373 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2374 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
2375 static void * |
| 487 | 2376 ngx_http_fastcgi_create_loc_conf(ngx_conf_t *cf) |
| 479 | 2377 { |
| 2378 ngx_http_fastcgi_loc_conf_t *conf; | |
| 2379 | |
| 501 | 2380 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_fastcgi_loc_conf_t)); |
| 2381 if (conf == NULL) { | |
|
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2895
diff
changeset
|
2382 return NULL; |
| 479 | 2383 } |
| 2384 | |
| 2385 /* | |
| 2386 * set by ngx_pcalloc(): | |
| 2387 * | |
| 2388 * conf->upstream.bufs.num = 0; | |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2729
diff
changeset
|
2389 * conf->upstream.ignore_headers = 0; |
| 479 | 2390 * conf->upstream.next_upstream = 0; |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
2391 * conf->upstream.cache_zone = NULL; |
|
2875
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
2392 * conf->upstream.cache_use_stale = 0; |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
2393 * conf->upstream.cache_methods = 0; |
| 479 | 2394 * conf->upstream.temp_path = NULL; |
| 649 | 2395 * conf->upstream.hide_headers_hash = { NULL, 0 }; |
| 509 | 2396 * conf->upstream.uri = { 0, NULL }; |
| 2397 * conf->upstream.location = NULL; | |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2398 * conf->upstream.store_lengths = NULL; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2399 * conf->upstream.store_values = NULL; |
| 509 | 2400 * |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3494
diff
changeset
|
2401 * conf->index.len = { 0, NULL }; |
| 479 | 2402 */ |
| 2403 | |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2404 conf->upstream.store = NGX_CONF_UNSET; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2405 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
|
2406 conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT; |
| 581 | 2407 conf->upstream.buffering = NGX_CONF_UNSET; |
| 629 | 2408 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; |
|
5874
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5847
diff
changeset
|
2409 conf->upstream.force_ranges = NGX_CONF_UNSET; |
| 581 | 2410 |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
4947
diff
changeset
|
2411 conf->upstream.local = NGX_CONF_UNSET_PTR; |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
4947
diff
changeset
|
2412 |
| 479 | 2413 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; |
| 2414 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; | |
| 507 | 2415 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
|
2416 conf->upstream.next_upstream_timeout = NGX_CONF_UNSET_MSEC; |
| 507 | 2417 |
| 479 | 2418 conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE; |
| 581 | 2419 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
|
2420 conf->upstream.limit_rate = NGX_CONF_UNSET_SIZE; |
| 529 | 2421 |
| 2422 conf->upstream.busy_buffers_size_conf = NGX_CONF_UNSET_SIZE; | |
| 577 | 2423 conf->upstream.max_temp_file_size_conf = NGX_CONF_UNSET_SIZE; |
| 529 | 2424 conf->upstream.temp_file_write_size_conf = NGX_CONF_UNSET_SIZE; |
| 509 | 2425 |
| 2426 conf->upstream.pass_request_headers = NGX_CONF_UNSET; | |
| 2427 conf->upstream.pass_request_body = NGX_CONF_UNSET; | |
| 2428 | |
| 2602 | 2429 #if (NGX_HTTP_CACHE) |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
2430 conf->upstream.cache = NGX_CONF_UNSET; |
| 2602 | 2431 conf->upstream.cache_min_uses = NGX_CONF_UNSET_UINT; |
|
3699
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3692
diff
changeset
|
2432 conf->upstream.cache_bypass = NGX_CONF_UNSET_PTR; |
|
3526
62a4fd1e6e2c
proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3523
diff
changeset
|
2433 conf->upstream.no_cache = NGX_CONF_UNSET_PTR; |
| 2602 | 2434 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR; |
|
4386
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
2435 conf->upstream.cache_lock = NGX_CONF_UNSET; |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
2436 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
|
2437 conf->upstream.cache_lock_age = NGX_CONF_UNSET_MSEC; |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5394
diff
changeset
|
2438 conf->upstream.cache_revalidate = NGX_CONF_UNSET; |
| 2602 | 2439 #endif |
| 2440 | |
|
1701
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1700
diff
changeset
|
2441 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR; |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1700
diff
changeset
|
2442 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR; |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1700
diff
changeset
|
2443 |
| 657 | 2444 conf->upstream.intercept_errors = NGX_CONF_UNSET; |
| 479 | 2445 |
| 2446 /* "fastcgi_cyclic_temp_file" is disabled */ | |
| 2447 conf->upstream.cyclic_temp_file = 0; | |
| 2448 | |
|
5394
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2449 conf->upstream.change_buffering = 1; |
|
8c827bb1b2b6
FastCGI: non-buffered mode support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5391
diff
changeset
|
2450 |
|
1452
cd586e963db0
change ngx_conf_merge_ptr_value() and update fastcgi_catch_stderr
Igor Sysoev <igor@sysoev.ru>
parents:
1295
diff
changeset
|
2451 conf->catch_stderr = NGX_CONF_UNSET_PTR; |
|
cd586e963db0
change ngx_conf_merge_ptr_value() and update fastcgi_catch_stderr
Igor Sysoev <igor@sysoev.ru>
parents:
1295
diff
changeset
|
2452 |
|
4122
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
2453 conf->keep_conn = NGX_CONF_UNSET; |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
2454 |
|
3976
215fe9223419
update r3945 with more descriptive error message
Igor Sysoev <igor@sysoev.ru>
parents:
3879
diff
changeset
|
2455 ngx_str_set(&conf->upstream.module, "fastcgi"); |
|
215fe9223419
update r3945 with more descriptive error message
Igor Sysoev <igor@sysoev.ru>
parents:
3879
diff
changeset
|
2456 |
| 479 | 2457 return conf; |
| 2458 } | |
| 2459 | |
| 2460 | |
| 487 | 2461 static char * |
| 2462 ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) | |
| 479 | 2463 { |
| 2464 ngx_http_fastcgi_loc_conf_t *prev = parent; | |
| 2465 ngx_http_fastcgi_loc_conf_t *conf = child; | |
| 2466 | |
| 509 | 2467 size_t size; |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
2468 ngx_int_t rc; |
| 649 | 2469 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
|
2470 ngx_http_core_loc_conf_t *clcf; |
| 479 | 2471 |
|
5948
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
2472 #if (NGX_HTTP_CACHE) |
|
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
2473 |
|
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
2474 if (conf->upstream.store > 0) { |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
2475 conf->upstream.cache = 0; |
|
5948
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
2476 } |
|
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
2477 |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
2478 if (conf->upstream.cache > 0) { |
|
5948
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
2479 conf->upstream.store = 0; |
|
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
2480 } |
|
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
2481 |
|
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
2482 #endif |
|
f2ff0aa89126
Upstream: mutually exclusive inheritance of "cache" and "store".
Valentin Bartenev <vbart@nginx.com>
parents:
5947
diff
changeset
|
2483 |
|
5940
e3b3b89d74e8
Upstream: fixed inheritance of proxy_store and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5938
diff
changeset
|
2484 if (conf->upstream.store == NGX_CONF_UNSET) { |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2485 ngx_conf_merge_value(conf->upstream.store, |
| 2894 | 2486 prev->upstream.store, 0); |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2487 |
|
5947
d9025ea1f5a5
Upstream: simplified proxy_store and friends configuration code.
Valentin Bartenev <vbart@nginx.com>
parents:
5940
diff
changeset
|
2488 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
|
2489 conf->upstream.store_values = prev->upstream.store_values; |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2490 } |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2491 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2492 ngx_conf_merge_uint_value(conf->upstream.store_access, |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
2493 prev->upstream.store_access, 0600); |
|
1291
13a4ce6e7f1e
proxy_store and fastcgi_store
Igor Sysoev <igor@sysoev.ru>
parents:
1276
diff
changeset
|
2494 |
|
5832
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
2495 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
|
2496 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
|
2497 |
| 581 | 2498 ngx_conf_merge_value(conf->upstream.buffering, |
| 2499 prev->upstream.buffering, 1); | |
| 2500 | |
| 629 | 2501 ngx_conf_merge_value(conf->upstream.ignore_client_abort, |
| 2502 prev->upstream.ignore_client_abort, 0); | |
| 2503 | |
|
5874
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5847
diff
changeset
|
2504 ngx_conf_merge_value(conf->upstream.force_ranges, |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5847
diff
changeset
|
2505 prev->upstream.force_ranges, 0); |
|
2aff40b3dea2
Upstream: proxy_force_ranges and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5847
diff
changeset
|
2506 |
|
5008
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
4947
diff
changeset
|
2507 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
|
2508 prev->upstream.local, NULL); |
|
fd84344f1df7
Fixed and improved the "*_bind" directives of proxying modules.
Ruslan Ermilov <ru@nginx.com>
parents:
4947
diff
changeset
|
2509 |
| 479 | 2510 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, |
| 2511 prev->upstream.connect_timeout, 60000); | |
| 507 | 2512 |
| 479 | 2513 ngx_conf_merge_msec_value(conf->upstream.send_timeout, |
| 2514 prev->upstream.send_timeout, 60000); | |
| 2515 | |
| 2516 ngx_conf_merge_msec_value(conf->upstream.read_timeout, | |
| 2517 prev->upstream.read_timeout, 60000); | |
| 2518 | |
|
5832
d09b689911ac
Upstream: limited next_upstream time and tries (ticket #544).
Roman Arutyunyan <arut@nginx.com>
parents:
5829
diff
changeset
|
2519 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
|
2520 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
|
2521 |
| 507 | 2522 ngx_conf_merge_size_value(conf->upstream.send_lowat, |
| 2523 prev->upstream.send_lowat, 0); | |
| 479 | 2524 |
| 581 | 2525 ngx_conf_merge_size_value(conf->upstream.buffer_size, |
| 2526 prev->upstream.buffer_size, | |
| 479 | 2527 (size_t) ngx_pagesize); |
| 2528 | |
|
5883
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
2529 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
|
2530 prev->upstream.limit_rate, 0); |
|
973ee2276300
Upstream: proxy_limit_rate and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5874
diff
changeset
|
2531 |
| 507 | 2532 |
| 479 | 2533 ngx_conf_merge_bufs_value(conf->upstream.bufs, prev->upstream.bufs, |
| 2534 8, ngx_pagesize); | |
| 2535 | |
| 2536 if (conf->upstream.bufs.num < 2) { | |
| 2537 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 2538 "there must be at least 2 \"fastcgi_buffers\""); | |
| 2539 return NGX_CONF_ERROR; | |
| 2540 } | |
| 2541 | |
| 2542 | |
| 581 | 2543 size = conf->upstream.buffer_size; |
| 479 | 2544 if (size < conf->upstream.bufs.size) { |
| 2545 size = conf->upstream.bufs.size; | |
| 2546 } | |
| 2547 | |
| 2548 | |
| 529 | 2549 ngx_conf_merge_size_value(conf->upstream.busy_buffers_size_conf, |
| 2550 prev->upstream.busy_buffers_size_conf, | |
| 479 | 2551 NGX_CONF_UNSET_SIZE); |
| 2552 | |
| 529 | 2553 if (conf->upstream.busy_buffers_size_conf == NGX_CONF_UNSET_SIZE) { |
| 479 | 2554 conf->upstream.busy_buffers_size = 2 * size; |
| 529 | 2555 } else { |
| 2556 conf->upstream.busy_buffers_size = | |
| 2557 conf->upstream.busy_buffers_size_conf; | |
| 2558 } | |
| 479 | 2559 |
| 529 | 2560 if (conf->upstream.busy_buffers_size < size) { |
| 479 | 2561 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
|
2562 "\"fastcgi_busy_buffers_size\" must be equal to or greater than " |
|
834049edae24
Fixed grammar in error messages.
Ruslan Ermilov <ru@nginx.com>
parents:
4529
diff
changeset
|
2563 "the maximum of the value of \"fastcgi_buffer_size\" and " |
| 479 | 2564 "one of the \"fastcgi_buffers\""); |
| 2565 | |
| 2566 return NGX_CONF_ERROR; | |
| 529 | 2567 } |
| 479 | 2568 |
| 529 | 2569 if (conf->upstream.busy_buffers_size |
| 2570 > (conf->upstream.bufs.num - 1) * conf->upstream.bufs.size) | |
| 479 | 2571 { |
| 2572 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 2573 "\"fastcgi_busy_buffers_size\" must be less than " | |
| 2574 "the size of all \"fastcgi_buffers\" minus one buffer"); | |
| 2575 | |
| 2576 return NGX_CONF_ERROR; | |
| 2577 } | |
| 2578 | |
| 2579 | |
| 529 | 2580 ngx_conf_merge_size_value(conf->upstream.temp_file_write_size_conf, |
| 2581 prev->upstream.temp_file_write_size_conf, | |
| 479 | 2582 NGX_CONF_UNSET_SIZE); |
| 2583 | |
| 529 | 2584 if (conf->upstream.temp_file_write_size_conf == NGX_CONF_UNSET_SIZE) { |
| 479 | 2585 conf->upstream.temp_file_write_size = 2 * size; |
| 529 | 2586 } else { |
| 2587 conf->upstream.temp_file_write_size = | |
| 2588 conf->upstream.temp_file_write_size_conf; | |
| 2589 } | |
| 479 | 2590 |
| 529 | 2591 if (conf->upstream.temp_file_write_size < size) { |
| 479 | 2592 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
|
2593 "\"fastcgi_temp_file_write_size\" must be equal to or greater " |
|
834049edae24
Fixed grammar in error messages.
Ruslan Ermilov <ru@nginx.com>
parents:
4529
diff
changeset
|
2594 "than the maximum of the value of \"fastcgi_buffer_size\" and " |
| 479 | 2595 "one of the \"fastcgi_buffers\""); |
| 2596 | |
| 2597 return NGX_CONF_ERROR; | |
| 2598 } | |
| 2599 | |
| 2600 | |
| 529 | 2601 ngx_conf_merge_size_value(conf->upstream.max_temp_file_size_conf, |
| 2602 prev->upstream.max_temp_file_size_conf, | |
| 479 | 2603 NGX_CONF_UNSET_SIZE); |
| 2604 | |
| 529 | 2605 if (conf->upstream.max_temp_file_size_conf == NGX_CONF_UNSET_SIZE) { |
| 479 | 2606 conf->upstream.max_temp_file_size = 1024 * 1024 * 1024; |
| 529 | 2607 } else { |
| 2608 conf->upstream.max_temp_file_size = | |
| 2609 conf->upstream.max_temp_file_size_conf; | |
| 2610 } | |
| 479 | 2611 |
| 529 | 2612 if (conf->upstream.max_temp_file_size != 0 |
| 2613 && conf->upstream.max_temp_file_size < size) | |
| 479 | 2614 { |
| 2615 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 2616 "\"fastcgi_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
|
2617 "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
|
2618 "the maximum of the value of \"fastcgi_buffer_size\" and " |
| 479 | 2619 "one of the \"fastcgi_buffers\""); |
| 2620 | |
| 2621 return NGX_CONF_ERROR; | |
| 2622 } | |
| 2623 | |
| 2624 | |
|
2786
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2729
diff
changeset
|
2625 ngx_conf_merge_bitmask_value(conf->upstream.ignore_headers, |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2729
diff
changeset
|
2626 prev->upstream.ignore_headers, |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2729
diff
changeset
|
2627 NGX_CONF_BITMASK_SET); |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2729
diff
changeset
|
2628 |
|
4e002555652d
proxy_ignore_headers and fastcgi_ignore_headers
Igor Sysoev <igor@sysoev.ru>
parents:
2729
diff
changeset
|
2629 |
| 479 | 2630 ngx_conf_merge_bitmask_value(conf->upstream.next_upstream, |
| 487 | 2631 prev->upstream.next_upstream, |
| 2632 (NGX_CONF_BITMASK_SET | |
| 2633 |NGX_HTTP_UPSTREAM_FT_ERROR | |
| 2634 |NGX_HTTP_UPSTREAM_FT_TIMEOUT)); | |
| 479 | 2635 |
| 665 | 2636 if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) { |
| 2637 conf->upstream.next_upstream = NGX_CONF_BITMASK_SET | |
| 2638 |NGX_HTTP_UPSTREAM_FT_OFF; | |
| 2639 } | |
| 2640 | |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2467
diff
changeset
|
2641 if (ngx_conf_merge_path_value(cf, &conf->upstream.temp_path, |
| 479 | 2642 prev->upstream.temp_path, |
|
2592
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2467
diff
changeset
|
2643 &ngx_http_fastcgi_temp_path) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2467
diff
changeset
|
2644 != NGX_OK) |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2467
diff
changeset
|
2645 { |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2467
diff
changeset
|
2646 return NGX_CONF_ERROR; |
|
3a8a53c0c42f
a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents:
2467
diff
changeset
|
2647 } |
| 479 | 2648 |
| 2602 | 2649 #if (NGX_HTTP_CACHE) |
| 2650 | |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
2651 if (conf->upstream.cache == NGX_CONF_UNSET) { |
|
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
2652 ngx_conf_merge_value(conf->upstream.cache, |
|
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
2653 prev->upstream.cache, 0); |
|
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
2654 |
|
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
2655 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
|
2656 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
|
2657 } |
|
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
2658 |
|
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
2659 if (conf->upstream.cache_zone && conf->upstream.cache_zone->data == NULL) { |
| 2602 | 2660 ngx_shm_zone_t *shm_zone; |
| 2661 | |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
2662 shm_zone = conf->upstream.cache_zone; |
| 2602 | 2663 |
| 2664 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 2665 "\"fastcgi_cache\" zone \"%V\" is unknown", | |
|
2716
d5896f6608e8
move zone name from ngx_shm_zone_t to ngx_shm_t to use Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2661
diff
changeset
|
2666 &shm_zone->shm.name); |
| 2602 | 2667 |
| 2668 return NGX_CONF_ERROR; | |
| 2669 } | |
| 2670 | |
| 2671 ngx_conf_merge_uint_value(conf->upstream.cache_min_uses, | |
| 2672 prev->upstream.cache_min_uses, 1); | |
| 2673 | |
| 2674 ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale, | |
| 2675 prev->upstream.cache_use_stale, | |
| 2676 (NGX_CONF_BITMASK_SET | |
| 2677 |NGX_HTTP_UPSTREAM_FT_OFF)); | |
| 2678 | |
| 2679 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) { | |
| 2680 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET | |
| 2681 |NGX_HTTP_UPSTREAM_FT_OFF; | |
| 2682 } | |
| 2683 | |
|
4401
d45742815c90
Fixed proxy_cache_use_stale in "no live upstreams" case.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4386
diff
changeset
|
2684 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
|
2685 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
|
2686 } |
|
d45742815c90
Fixed proxy_cache_use_stale in "no live upstreams" case.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4386
diff
changeset
|
2687 |
|
2875
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
2688 if (conf->upstream.cache_methods == 0) { |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
2689 conf->upstream.cache_methods = prev->upstream.cache_methods; |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
2690 } |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
2691 |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
2692 conf->upstream.cache_methods |= NGX_HTTP_GET|NGX_HTTP_HEAD; |
|
6e1941b321b7
proxy_cache_methods and fastcgi_cache_methods
Igor Sysoev <igor@sysoev.ru>
parents:
2786
diff
changeset
|
2693 |
|
3699
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3692
diff
changeset
|
2694 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:
3692
diff
changeset
|
2695 prev->upstream.cache_bypass, NULL); |
|
b0a0686a85bb
proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass
Igor Sysoev <igor@sysoev.ru>
parents:
3692
diff
changeset
|
2696 |
|
3526
62a4fd1e6e2c
proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3523
diff
changeset
|
2697 ngx_conf_merge_ptr_value(conf->upstream.no_cache, |
|
62a4fd1e6e2c
proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3523
diff
changeset
|
2698 prev->upstream.no_cache, NULL); |
|
62a4fd1e6e2c
proxy_no_cache and fastcgi_no_cache
Igor Sysoev <igor@sysoev.ru>
parents:
3523
diff
changeset
|
2699 |
| 2602 | 2700 ngx_conf_merge_ptr_value(conf->upstream.cache_valid, |
| 2701 prev->upstream.cache_valid, NULL); | |
| 2702 | |
| 2661 | 2703 if (conf->cache_key.value.data == NULL) { |
| 2704 conf->cache_key = prev->cache_key; | |
| 2705 } | |
| 2706 | |
|
5829
906530c9ffd2
Added warning about unset cache keys.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5738
diff
changeset
|
2707 if (conf->upstream.cache && conf->cache_key.value.data == NULL) { |
|
906530c9ffd2
Added warning about unset cache keys.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5738
diff
changeset
|
2708 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, |
|
906530c9ffd2
Added warning about unset cache keys.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5738
diff
changeset
|
2709 "no \"fastcgi_cache_key\" for \"fastcgi_cache\""); |
|
906530c9ffd2
Added warning about unset cache keys.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5738
diff
changeset
|
2710 } |
|
906530c9ffd2
Added warning about unset cache keys.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5738
diff
changeset
|
2711 |
|
4386
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
2712 ngx_conf_merge_value(conf->upstream.cache_lock, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
2713 prev->upstream.cache_lock, 0); |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
2714 |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
2715 ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout, |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
2716 prev->upstream.cache_lock_timeout, 5000); |
|
92deb73393f7
Cache lock support for fastcgi, scgi, uwsgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4329
diff
changeset
|
2717 |
|
5905
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
2718 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
|
2719 prev->upstream.cache_lock_age, 5000); |
|
2f7e557eab5b
Cache: proxy_cache_lock_age and friends.
Roman Arutyunyan <arut@nginx.com>
parents:
5883
diff
changeset
|
2720 |
|
5441
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5394
diff
changeset
|
2721 ngx_conf_merge_value(conf->upstream.cache_revalidate, |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5394
diff
changeset
|
2722 prev->upstream.cache_revalidate, 0); |
|
43ccaf8e8728
Upstream: cache revalidation with conditional requests.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5394
diff
changeset
|
2723 |
| 2602 | 2724 #endif |
| 2725 | |
| 509 | 2726 ngx_conf_merge_value(conf->upstream.pass_request_headers, |
| 2727 prev->upstream.pass_request_headers, 1); | |
| 2728 ngx_conf_merge_value(conf->upstream.pass_request_body, | |
| 2729 prev->upstream.pass_request_body, 1); | |
| 2730 | |
| 657 | 2731 ngx_conf_merge_value(conf->upstream.intercept_errors, |
| 2732 prev->upstream.intercept_errors, 0); | |
| 509 | 2733 |
| 1228 | 2734 ngx_conf_merge_ptr_value(conf->catch_stderr, prev->catch_stderr, NULL); |
| 2735 | |
|
4122
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
2736 ngx_conf_merge_value(conf->keep_conn, prev->keep_conn, 0); |
|
c7fae0daeb57
Keepalive support in fastcgi.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4015
diff
changeset
|
2737 |
| 507 | 2738 |
| 479 | 2739 ngx_conf_merge_str_value(conf->index, prev->index, ""); |
| 2740 | |
|
1701
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1700
diff
changeset
|
2741 hash.max_size = 512; |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1700
diff
changeset
|
2742 hash.bucket_size = ngx_align(64, ngx_cacheline_size); |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1700
diff
changeset
|
2743 hash.name = "fastcgi_hide_headers_hash"; |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1700
diff
changeset
|
2744 |
|
40d004d95d88
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
Igor Sysoev <igor@sysoev.ru>
parents:
1700
diff
changeset
|
2745 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:
3667
diff
changeset
|
2746 &prev->upstream, ngx_http_fastcgi_hide_headers, &hash) |
| 649 | 2747 != NGX_OK) |
| 2748 { | |
| 2749 return NGX_CONF_ERROR; | |
| 2750 } | |
| 2751 | |
|
5938
cd2abf7e7740
Upstream: fixed unexpected inheritance into limit_except blocks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5937
diff
changeset
|
2752 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
|
2753 |
|
cd2abf7e7740
Upstream: fixed unexpected inheritance into limit_except blocks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5937
diff
changeset
|
2754 if (clcf->noname |
|
cd2abf7e7740
Upstream: fixed unexpected inheritance into limit_except blocks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5937
diff
changeset
|
2755 && conf->upstream.upstream == NULL && conf->fastcgi_lengths == NULL) |
|
cd2abf7e7740
Upstream: fixed unexpected inheritance into limit_except blocks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5937
diff
changeset
|
2756 { |
| 884 | 2757 conf->upstream.upstream = prev->upstream.upstream; |
|
2390
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
2758 conf->fastcgi_lengths = prev->fastcgi_lengths; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
2759 conf->fastcgi_values = prev->fastcgi_values; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
2760 } |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
2761 |
|
5938
cd2abf7e7740
Upstream: fixed unexpected inheritance into limit_except blocks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5937
diff
changeset
|
2762 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
|
2763 && (conf->upstream.upstream || conf->fastcgi_lengths)) |
|
cd2abf7e7740
Upstream: fixed unexpected inheritance into limit_except blocks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5937
diff
changeset
|
2764 { |
|
cd2abf7e7740
Upstream: fixed unexpected inheritance into limit_except blocks.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5937
diff
changeset
|
2765 clcf->handler = ngx_http_fastcgi_handler; |
|
3731
72cc5b789021
inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside
Igor Sysoev <igor@sysoev.ru>
parents:
3729
diff
changeset
|
2766 } |
|
72cc5b789021
inherit proxy_pass, fastcgi_pass, uwsgi_pass, scgi_pass inside
Igor Sysoev <igor@sysoev.ru>
parents:
3729
diff
changeset
|
2767 |
| 2443 | 2768 #if (NGX_PCRE) |
| 2769 if (conf->split_regex == NULL) { | |
| 2770 conf->split_regex = prev->split_regex; | |
| 2771 conf->split_name = prev->split_name; | |
| 2772 } | |
| 2773 #endif | |
| 2774 | |
|
5907
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5905
diff
changeset
|
2775 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
|
2776 conf->params = prev->params; |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
2777 #if (NGX_HTTP_CACHE) |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
2778 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
|
2779 #endif |
|
5907
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5905
diff
changeset
|
2780 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
|
2781 } |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
2782 |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
2783 rc = ngx_http_fastcgi_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
|
2784 if (rc != NGX_OK) { |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
2785 return NGX_CONF_ERROR; |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
2786 } |
|
5907
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5905
diff
changeset
|
2787 |
|
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5905
diff
changeset
|
2788 #if (NGX_HTTP_CACHE) |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
2789 |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
2790 if (conf->upstream.cache) { |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
2791 rc = ngx_http_fastcgi_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
|
2792 ngx_http_fastcgi_cache_headers); |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
2793 if (rc != NGX_OK) { |
|
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
2794 return NGX_CONF_ERROR; |
|
5907
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5905
diff
changeset
|
2795 } |
|
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5905
diff
changeset
|
2796 } |
|
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5905
diff
changeset
|
2797 |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
2798 #endif |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2799 |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2800 return NGX_CONF_OK; |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2801 } |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2802 |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2803 |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2804 static ngx_int_t |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
2805 ngx_http_fastcgi_init_params(ngx_conf_t *cf, ngx_http_fastcgi_loc_conf_t *conf, |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
2806 ngx_http_fastcgi_params_t *params, ngx_keyval_t *default_params) |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2807 { |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2808 u_char *p; |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2809 size_t size; |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2810 uintptr_t *code; |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2811 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
|
2812 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
|
2813 ngx_keyval_t *h; |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2814 ngx_hash_key_t *hk; |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2815 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
|
2816 ngx_http_upstream_param_t *src, *s; |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2817 ngx_http_script_compile_t sc; |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2818 ngx_http_script_copy_code_t *copy; |
|
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2819 |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
2820 if (params->hash.buckets) { |
|
5907
195561ef367f
Upstream: moved header initializations to separate functions.
Roman Arutyunyan <arut@nginx.com>
parents:
5905
diff
changeset
|
2821 return NGX_OK; |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2822 } |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2823 |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
2824 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
|
2825 params->hash.buckets = (void *) 1; |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2826 return NGX_OK; |
| 509 | 2827 } |
| 2828 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
2829 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
|
2830 if (params->lengths == NULL) { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2831 return NGX_ERROR; |
| 509 | 2832 } |
| 573 | 2833 |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
2834 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
|
2835 if (params->values == NULL) { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2836 return NGX_ERROR; |
| 509 | 2837 } |
| 2838 | |
|
3560
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2839 if (ngx_array_init(&headers_names, cf->temp_pool, 4, sizeof(ngx_hash_key_t)) |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2840 != NGX_OK) |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2841 { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2842 return NGX_ERROR; |
|
3560
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2843 } |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2844 |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2845 if (conf->params_source) { |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2846 src = conf->params_source->elts; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2847 nsrc = conf->params_source->nelts; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2848 |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2849 } else { |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2850 src = NULL; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2851 nsrc = 0; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2852 } |
|
3563
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
2853 |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
2854 if (default_params) { |
|
4329
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
2855 if (ngx_array_init(¶ms_merged, cf->temp_pool, 4, |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
2856 sizeof(ngx_http_upstream_param_t)) |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2857 != NGX_OK) |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2858 { |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2859 return NGX_ERROR; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2860 } |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2861 |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2862 for (i = 0; i < nsrc; i++) { |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2863 |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2864 s = ngx_array_push(¶ms_merged); |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2865 if (s == NULL) { |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2866 return NGX_ERROR; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2867 } |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2868 |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2869 *s = src[i]; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2870 } |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2871 |
|
5909
8d0cf26ce071
Upstream: different header lists for cached and uncached requests.
Roman Arutyunyan <arut@nginx.com>
parents:
5908
diff
changeset
|
2872 h = default_params; |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2873 |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2874 while (h->key.len) { |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2875 |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2876 src = params_merged.elts; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2877 nsrc = params_merged.nelts; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2878 |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2879 for (i = 0; i < nsrc; i++) { |
|
3563
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
2880 if (ngx_strcasecmp(h->key.data, src[i].key.data) == 0) { |
|
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
2881 goto next; |
|
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
2882 } |
|
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
2883 } |
|
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
2884 |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2885 s = ngx_array_push(¶ms_merged); |
|
3563
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
2886 if (s == NULL) { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2887 return NGX_ERROR; |
|
3563
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
2888 } |
|
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
2889 |
|
4329
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
2890 s->key = h->key; |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
2891 s->value = h->value; |
|
5451
e68af4e3396f
Upstream: skip empty cache headers.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5441
diff
changeset
|
2892 s->skip_empty = 1; |
|
3563
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
2893 |
|
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
2894 next: |
|
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
2895 |
|
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
2896 h++; |
|
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
2897 } |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2898 |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2899 src = params_merged.elts; |
|
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2900 nsrc = params_merged.nelts; |
|
3563
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
2901 } |
|
90d7227d47bf
do not pass if-... headers for cacheable fastcgi responses
Igor Sysoev <igor@sysoev.ru>
parents:
3562
diff
changeset
|
2902 |
|
4278
f57229cba7ad
Fixed fastcgi/scgi/uwsgi_param inheritance.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4277
diff
changeset
|
2903 for (i = 0; i < nsrc; i++) { |
| 509 | 2904 |
|
3560
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2905 if (src[i].key.len > sizeof("HTTP_") - 1 |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2906 && ngx_strncmp(src[i].key.data, "HTTP_", sizeof("HTTP_") - 1) == 0) |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2907 { |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2908 hk = ngx_array_push(&headers_names); |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2909 if (hk == NULL) { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2910 return NGX_ERROR; |
|
3560
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2911 } |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2912 |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2913 hk->key.len = src[i].key.len - 5; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2914 hk->key.data = src[i].key.data + 5; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2915 hk->key_hash = ngx_hash_key_lc(hk->key.data, hk->key.len); |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2916 hk->value = (void *) 1; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2917 |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2918 if (src[i].value.len == 0) { |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2919 continue; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2920 } |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2921 } |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2922 |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
2923 copy = ngx_array_push_n(params->lengths, |
|
3558
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2924 sizeof(ngx_http_script_copy_code_t)); |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2925 if (copy == NULL) { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2926 return NGX_ERROR; |
|
3558
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2927 } |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2928 |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2929 copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code; |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2930 copy->len = src[i].key.len; |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2931 |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
2932 copy = ngx_array_push_n(params->lengths, |
|
4329
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
2933 sizeof(ngx_http_script_copy_code_t)); |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
2934 if (copy == NULL) { |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
2935 return NGX_ERROR; |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
2936 } |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
2937 |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
2938 copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code; |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
2939 copy->len = src[i].skip_empty; |
|
31e6bfca10a5
FastCGI: added "if_not_empty" flag support to the "fastcgi_param" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4278
diff
changeset
|
2940 |
|
3558
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2941 |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2942 size = (sizeof(ngx_http_script_copy_code_t) |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2943 + src[i].key.len + sizeof(uintptr_t) - 1) |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2944 & ~(sizeof(uintptr_t) - 1); |
|
3558
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2945 |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
2946 copy = ngx_array_push_n(params->values, size); |
|
3558
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2947 if (copy == NULL) { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2948 return NGX_ERROR; |
|
3558
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2949 } |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2950 |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2951 copy->code = ngx_http_script_copy_code; |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2952 copy->len = src[i].key.len; |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2953 |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2954 p = (u_char *) copy + sizeof(ngx_http_script_copy_code_t); |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2955 ngx_memcpy(p, src[i].key.data, src[i].key.len); |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2956 |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2957 |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2958 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t)); |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2959 |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2960 sc.cf = cf; |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2961 sc.source = &src[i].value; |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
2962 sc.flushes = ¶ms->flushes; |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
2963 sc.lengths = ¶ms->lengths; |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
2964 sc.values = ¶ms->values; |
|
3558
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2965 |
|
83c9a10ec029
remove the special static fastcgi_param values processing,
Igor Sysoev <igor@sysoev.ru>
parents:
3526
diff
changeset
|
2966 if (ngx_http_script_compile(&sc) != NGX_OK) { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2967 return NGX_ERROR; |
| 509 | 2968 } |
| 2969 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
2970 code = ngx_array_push_n(params->lengths, sizeof(uintptr_t)); |
| 509 | 2971 if (code == NULL) { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2972 return NGX_ERROR; |
| 509 | 2973 } |
| 2974 | |
| 2975 *code = (uintptr_t) NULL; | |
| 2976 | |
| 2977 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
2978 code = ngx_array_push_n(params->values, sizeof(uintptr_t)); |
| 509 | 2979 if (code == NULL) { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2980 return NGX_ERROR; |
| 509 | 2981 } |
| 2982 | |
| 2983 *code = (uintptr_t) NULL; | |
| 2984 } | |
| 2985 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
2986 code = ngx_array_push_n(params->lengths, sizeof(uintptr_t)); |
| 509 | 2987 if (code == NULL) { |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
2988 return NGX_ERROR; |
| 509 | 2989 } |
| 2990 | |
| 2991 *code = (uintptr_t) NULL; | |
| 2992 | |
|
5908
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
2993 params->number = headers_names.nelts; |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
2994 |
|
f8e80f8c7fc7
Upstream: moved header lists to separate structures.
Roman Arutyunyan <arut@nginx.com>
parents:
5907
diff
changeset
|
2995 hash.hash = ¶ms->hash; |
|
3560
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2996 hash.key = ngx_hash_key_lc; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2997 hash.max_size = 512; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2998 hash.bucket_size = 64; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
2999 hash.name = "fastcgi_params_hash"; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
3000 hash.pool = cf->pool; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
3001 hash.temp_pool = NULL; |
|
a36c63c6d26a
allow fastcgi_param to override client headers using HTTP_ parameters
Igor Sysoev <igor@sysoev.ru>
parents:
3559
diff
changeset
|
3002 |
|
4277
e4b8255e44c3
Separate functions to merge fastcgi/scgi/uwsgi params.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
3003 return ngx_hash_init(&hash, headers_names.elts, headers_names.nelts); |
| 479 | 3004 } |
| 509 | 3005 |
| 3006 | |
| 573 | 3007 static ngx_int_t |
| 3008 ngx_http_fastcgi_script_name_variable(ngx_http_request_t *r, | |
| 3009 ngx_http_variable_value_t *v, uintptr_t data) | |
| 509 | 3010 { |
| 3011 u_char *p; | |
| 2443 | 3012 ngx_http_fastcgi_ctx_t *f; |
| 509 | 3013 ngx_http_fastcgi_loc_conf_t *flcf; |
| 3014 | |
| 2443 | 3015 flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module); |
| 3016 | |
|
2467
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3017 f = ngx_http_fastcgi_split(r, flcf); |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3018 |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3019 if (f == NULL) { |
| 2443 | 3020 return NGX_ERROR; |
| 3021 } | |
| 3022 | |
| 3023 if (f->script_name.len == 0 | |
| 3024 || f->script_name.data[f->script_name.len - 1] != '/') | |
| 3025 { | |
| 3026 v->len = f->script_name.len; | |
|
1097
df8cdf626c87
fix segfault when $fastcgi_script_name is used in access_log
Igor Sysoev <igor@sysoev.ru>
parents:
1037
diff
changeset
|
3027 v->valid = 1; |
| 1565 | 3028 v->no_cacheable = 0; |
|
1097
df8cdf626c87
fix segfault when $fastcgi_script_name is used in access_log
Igor Sysoev <igor@sysoev.ru>
parents:
1037
diff
changeset
|
3029 v->not_found = 0; |
| 2443 | 3030 v->data = f->script_name.data; |
|
1097
df8cdf626c87
fix segfault when $fastcgi_script_name is used in access_log
Igor Sysoev <igor@sysoev.ru>
parents:
1037
diff
changeset
|
3031 |
| 573 | 3032 return NGX_OK; |
| 509 | 3033 } |
| 3034 | |
| 2443 | 3035 v->len = f->script_name.len + flcf->index.len; |
| 3036 | |
| 3037 v->data = ngx_pnalloc(r->pool, v->len); | |
| 3038 if (v->data == NULL) { | |
| 3039 return NGX_ERROR; | |
| 3040 } | |
| 3041 | |
| 3042 p = ngx_copy(v->data, f->script_name.data, f->script_name.len); | |
| 3043 ngx_memcpy(p, flcf->index.data, flcf->index.len); | |
| 3044 | |
| 573 | 3045 return NGX_OK; |
| 509 | 3046 } |
| 3047 | |
| 3048 | |
| 2443 | 3049 static ngx_int_t |
| 3050 ngx_http_fastcgi_path_info_variable(ngx_http_request_t *r, | |
| 3051 ngx_http_variable_value_t *v, uintptr_t data) | |
| 3052 { | |
| 3053 ngx_http_fastcgi_ctx_t *f; | |
| 3054 ngx_http_fastcgi_loc_conf_t *flcf; | |
| 3055 | |
| 3056 flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module); | |
| 3057 | |
|
2467
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3058 f = ngx_http_fastcgi_split(r, flcf); |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3059 |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3060 if (f == NULL) { |
| 2443 | 3061 return NGX_ERROR; |
| 3062 } | |
| 3063 | |
| 3064 v->len = f->path_info.len; | |
| 3065 v->valid = 1; | |
| 3066 v->no_cacheable = 0; | |
| 3067 v->not_found = 0; | |
| 3068 v->data = f->path_info.data; | |
| 3069 | |
| 3070 return NGX_OK; | |
| 3071 } | |
| 3072 | |
| 3073 | |
|
2467
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3074 static ngx_http_fastcgi_ctx_t * |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3075 ngx_http_fastcgi_split(ngx_http_request_t *r, ngx_http_fastcgi_loc_conf_t *flcf) |
| 2443 | 3076 { |
|
2467
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3077 ngx_http_fastcgi_ctx_t *f; |
| 2443 | 3078 #if (NGX_PCRE) |
|
2467
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3079 ngx_int_t n; |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3080 int captures[(1 + 2) * 3]; |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3081 |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3082 f = ngx_http_get_module_ctx(r, ngx_http_fastcgi_module); |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3083 |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3084 if (f == NULL) { |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3085 f = ngx_pcalloc(r->pool, sizeof(ngx_http_fastcgi_ctx_t)); |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3086 if (f == NULL) { |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3087 return NULL; |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3088 } |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3089 |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3090 ngx_http_set_ctx(r, f, ngx_http_fastcgi_module); |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3091 } |
| 2443 | 3092 |
| 3093 if (f->script_name.len) { | |
|
2467
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3094 return f; |
| 2443 | 3095 } |
| 3096 | |
| 3097 if (flcf->split_regex == NULL) { | |
| 3098 f->script_name = r->uri; | |
|
2467
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3099 return f; |
| 2443 | 3100 } |
| 3101 | |
| 3102 n = ngx_regex_exec(flcf->split_regex, &r->uri, captures, (1 + 2) * 3); | |
| 3103 | |
| 3325 | 3104 if (n >= 0) { /* match */ |
| 3105 f->script_name.len = captures[3] - captures[2]; | |
|
3735
1ba712d077d1
fix fastcgi_split_path_info, if URI was not fully captured
Igor Sysoev <igor@sysoev.ru>
parents:
3731
diff
changeset
|
3106 f->script_name.data = r->uri.data + captures[2]; |
| 3325 | 3107 |
| 3108 f->path_info.len = captures[5] - captures[4]; | |
|
3735
1ba712d077d1
fix fastcgi_split_path_info, if URI was not fully captured
Igor Sysoev <igor@sysoev.ru>
parents:
3731
diff
changeset
|
3109 f->path_info.data = r->uri.data + captures[4]; |
| 3325 | 3110 |
| 3111 return f; | |
| 3112 } | |
| 3113 | |
| 2443 | 3114 if (n == NGX_REGEX_NO_MATCHED) { |
| 3115 f->script_name = r->uri; | |
|
2467
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3116 return f; |
| 2443 | 3117 } |
| 3118 | |
| 3325 | 3119 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, |
| 3120 ngx_regex_exec_n " failed: %i on \"%V\" using \"%V\"", | |
| 3121 n, &r->uri, &flcf->split_name); | |
| 3122 return NULL; | |
| 2443 | 3123 |
| 3124 #else | |
| 3125 | |
|
2467
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3126 f = ngx_http_get_module_ctx(r, ngx_http_fastcgi_module); |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3127 |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3128 if (f == NULL) { |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3129 f = ngx_pcalloc(r->pool, sizeof(ngx_http_fastcgi_ctx_t)); |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3130 if (f == NULL) { |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3131 return NULL; |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3132 } |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3133 |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3134 ngx_http_set_ctx(r, f, ngx_http_fastcgi_module); |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3135 } |
|
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3136 |
| 2443 | 3137 f->script_name = r->uri; |
| 3138 | |
|
2467
84f2bef92007
fix segfault if $fastcgi_script_name or $fastcgi_path_info were used before
Igor Sysoev <igor@sysoev.ru>
parents:
2443
diff
changeset
|
3139 return f; |
| 2443 | 3140 |
| 3141 #endif | |
| 3142 } | |
| 3143 | |
| 3144 | |
| 509 | 3145 static char * |
| 3146 ngx_http_fastcgi_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 3147 { | |
|
2390
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3148 ngx_http_fastcgi_loc_conf_t *flcf = conf; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3149 |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3150 ngx_url_t u; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3151 ngx_str_t *value, *url; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3152 ngx_uint_t n; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3153 ngx_http_core_loc_conf_t *clcf; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3154 ngx_http_script_compile_t sc; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3155 |
|
2391
d88e757cc7d8
delete surplus upstream.schema field
Igor Sysoev <igor@sysoev.ru>
parents:
2390
diff
changeset
|
3156 if (flcf->upstream.upstream || flcf->fastcgi_lengths) { |
| 555 | 3157 return "is duplicate"; |
| 3158 } | |
| 3159 | |
|
2390
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3160 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); |
|
2989
dff9764eaca2
do auto redirect for proxy_pass/fastcgi_pass with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2927
diff
changeset
|
3161 |
|
2390
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3162 clcf->handler = ngx_http_fastcgi_handler; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3163 |
|
2989
dff9764eaca2
do auto redirect for proxy_pass/fastcgi_pass with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2927
diff
changeset
|
3164 if (clcf->name.data[clcf->name.len - 1] == '/') { |
|
dff9764eaca2
do auto redirect for proxy_pass/fastcgi_pass with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2927
diff
changeset
|
3165 clcf->auto_redirect = 1; |
|
dff9764eaca2
do auto redirect for proxy_pass/fastcgi_pass with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2927
diff
changeset
|
3166 } |
|
dff9764eaca2
do auto redirect for proxy_pass/fastcgi_pass with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2927
diff
changeset
|
3167 |
| 509 | 3168 value = cf->args->elts; |
| 3169 | |
|
2390
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3170 url = &value[1]; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3171 |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3172 n = ngx_http_script_variables_count(url); |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3173 |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3174 if (n) { |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3175 |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3176 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t)); |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3177 |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3178 sc.cf = cf; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3179 sc.source = url; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3180 sc.lengths = &flcf->fastcgi_lengths; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3181 sc.values = &flcf->fastcgi_values; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3182 sc.variables = n; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3183 sc.complete_lengths = 1; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3184 sc.complete_values = 1; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3185 |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3186 if (ngx_http_script_compile(&sc) != NGX_OK) { |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3187 return NGX_CONF_ERROR; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3188 } |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3189 |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3190 return NGX_CONF_OK; |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3191 } |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3192 |
| 651 | 3193 ngx_memzero(&u, sizeof(ngx_url_t)); |
| 3194 | |
| 3195 u.url = value[1]; | |
| 884 | 3196 u.no_resolve = 1; |
| 3197 | |
|
2390
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3198 flcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0); |
|
27ccc4b54fa6
fastcgi_pass variables support
Igor Sysoev <igor@sysoev.ru>
parents:
2256
diff
changeset
|
3199 if (flcf->upstream.upstream == NULL) { |
| 509 | 3200 return NGX_CONF_ERROR; |
| 3201 } | |
| 3202 | |
| 3203 return NGX_CONF_OK; | |
| 3204 } | |
| 3205 | |
| 3206 | |
| 3207 static char * | |
| 2443 | 3208 ngx_http_fastcgi_split_path_info(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
| 3209 { | |
| 3210 #if (NGX_PCRE) | |
| 3211 ngx_http_fastcgi_loc_conf_t *flcf = conf; | |
| 3212 | |
| 3325 | 3213 ngx_str_t *value; |
| 3214 ngx_regex_compile_t rc; | |
| 3215 u_char errstr[NGX_MAX_CONF_ERRSTR]; | |
| 2443 | 3216 |
| 3217 value = cf->args->elts; | |
| 3218 | |
| 3219 flcf->split_name = value[1]; | |
| 3220 | |
| 3325 | 3221 ngx_memzero(&rc, sizeof(ngx_regex_compile_t)); |
| 3222 | |
| 3223 rc.pattern = value[1]; | |
| 3224 rc.pool = cf->pool; | |
| 3225 rc.err.len = NGX_MAX_CONF_ERRSTR; | |
| 3226 rc.err.data = errstr; | |
| 3227 | |
| 3228 if (ngx_regex_compile(&rc) != NGX_OK) { | |
| 3229 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &rc.err); | |
| 2443 | 3230 return NGX_CONF_ERROR; |
| 3231 } | |
| 3232 | |
| 3325 | 3233 if (rc.captures != 2) { |
| 2443 | 3234 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 3235 "pattern \"%V\" must have 2 captures", &value[1]); | |
| 3236 return NGX_CONF_ERROR; | |
| 3237 } | |
| 3238 | |
| 3325 | 3239 flcf->split_regex = rc.regex; |
| 3240 | |
| 2443 | 3241 return NGX_CONF_OK; |
| 3242 | |
| 3243 #else | |
| 3244 | |
| 3245 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 3246 "\"%V\" requires PCRE library", &cmd->name); | |
| 3247 return NGX_CONF_ERROR; | |
| 3248 | |
| 3249 #endif | |
| 3250 } | |
| 3251 | |
| 3252 | |
| 3253 static char * | |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3254 ngx_http_fastcgi_store(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3255 { |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3256 ngx_http_fastcgi_loc_conf_t *flcf = conf; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3257 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3258 ngx_str_t *value; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3259 ngx_http_script_compile_t sc; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3260 |
|
5947
d9025ea1f5a5
Upstream: simplified proxy_store and friends configuration code.
Valentin Bartenev <vbart@nginx.com>
parents:
5940
diff
changeset
|
3261 if (flcf->upstream.store != NGX_CONF_UNSET) { |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3262 return "is duplicate"; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3263 } |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3264 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3265 value = cf->args->elts; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3266 |
|
2895
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3267 if (ngx_strcmp(value[1].data, "off") == 0) { |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3268 flcf->upstream.store = 0; |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3269 return NGX_CONF_OK; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3270 } |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3271 |
|
2895
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3272 #if (NGX_HTTP_CACHE) |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
3273 if (flcf->upstream.cache > 0) { |
|
2895
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3274 return "is incompatible with \"fastcgi_cache\""; |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3275 } |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3276 #endif |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3277 |
|
5947
d9025ea1f5a5
Upstream: simplified proxy_store and friends configuration code.
Valentin Bartenev <vbart@nginx.com>
parents:
5940
diff
changeset
|
3278 flcf->upstream.store = 1; |
|
d9025ea1f5a5
Upstream: simplified proxy_store and friends configuration code.
Valentin Bartenev <vbart@nginx.com>
parents:
5940
diff
changeset
|
3279 |
|
2895
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3280 if (ngx_strcmp(value[1].data, "on") == 0) { |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3281 return NGX_CONF_OK; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3282 } |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3283 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3284 /* include the terminating '\0' into script */ |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3285 value[1].len++; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3286 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3287 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t)); |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3288 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3289 sc.cf = cf; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3290 sc.source = &value[1]; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3291 sc.lengths = &flcf->upstream.store_lengths; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3292 sc.values = &flcf->upstream.store_values; |
|
1563
022ec9420f80
style fix: remove double semicolons
Igor Sysoev <igor@sysoev.ru>
parents:
1488
diff
changeset
|
3293 sc.variables = ngx_http_script_variables_count(&value[1]); |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3294 sc.complete_lengths = 1; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3295 sc.complete_values = 1; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3296 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3297 if (ngx_http_script_compile(&sc) != NGX_OK) { |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3298 return NGX_CONF_ERROR; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3299 } |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3300 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3301 return NGX_CONF_OK; |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3302 } |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3303 |
|
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3304 |
| 2602 | 3305 #if (NGX_HTTP_CACHE) |
| 3306 | |
| 3307 static char * | |
| 3308 ngx_http_fastcgi_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 3309 { | |
| 3310 ngx_http_fastcgi_loc_conf_t *flcf = conf; | |
| 3311 | |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3312 ngx_str_t *value; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3313 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
|
3314 ngx_http_compile_complex_value_t ccv; |
| 2602 | 3315 |
| 3316 value = cf->args->elts; | |
| 3317 | |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
3318 if (flcf->upstream.cache != NGX_CONF_UNSET) { |
| 2602 | 3319 return "is duplicate"; |
| 3320 } | |
| 3321 | |
| 3322 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
|
3323 flcf->upstream.cache = 0; |
| 2602 | 3324 return NGX_CONF_OK; |
| 3325 } | |
| 3326 | |
|
5947
d9025ea1f5a5
Upstream: simplified proxy_store and friends configuration code.
Valentin Bartenev <vbart@nginx.com>
parents:
5940
diff
changeset
|
3327 if (flcf->upstream.store > 0) { |
|
2895
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3328 return "is incompatible with \"fastcgi_store\""; |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3329 } |
|
d65e58a8d3a4
report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
Igor Sysoev <igor@sysoev.ru>
parents:
2894
diff
changeset
|
3330 |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
3331 flcf->upstream.cache = 1; |
|
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
3332 |
|
5951
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3333 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
|
3334 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3335 ccv.cf = cf; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3336 ccv.value = &value[1]; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3337 ccv.complex_value = &cv; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3338 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3339 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
|
3340 return NGX_CONF_ERROR; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3341 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3342 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3343 if (cv.lengths != NULL) { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3344 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3345 flcf->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
|
3346 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
|
3347 if (flcf->upstream.cache_value == NULL) { |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3348 return NGX_CONF_ERROR; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3349 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3350 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3351 *flcf->upstream.cache_value = cv; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3352 |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3353 return NGX_CONF_OK; |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3354 } |
|
610832763648
Upstream: added variables support to proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5949
diff
changeset
|
3355 |
|
5949
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
3356 flcf->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
|
3357 &ngx_http_fastcgi_module); |
|
634da79665d3
Upstream: refactored proxy_cache and friends.
Valentin Bartenev <vbart@nginx.com>
parents:
5948
diff
changeset
|
3358 if (flcf->upstream.cache_zone == NULL) { |
| 2602 | 3359 return NGX_CONF_ERROR; |
| 3360 } | |
| 3361 | |
| 3362 return NGX_CONF_OK; | |
| 3363 } | |
| 3364 | |
| 3365 | |
| 3366 static char * | |
| 3367 ngx_http_fastcgi_cache_key(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 3368 { | |
| 3369 ngx_http_fastcgi_loc_conf_t *flcf = conf; | |
| 3370 | |
| 3371 ngx_str_t *value; | |
| 3372 ngx_http_compile_complex_value_t ccv; | |
| 3373 | |
| 3374 value = cf->args->elts; | |
| 3375 | |
|
4947
4251e72b8bb4
Allow the complex value to be defined as an empty string.
Ruslan Ermilov <ru@nginx.com>
parents:
4811
diff
changeset
|
3376 if (flcf->cache_key.value.data) { |
| 2602 | 3377 return "is duplicate"; |
| 3378 } | |
| 3379 | |
| 3380 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); | |
| 3381 | |
| 3382 ccv.cf = cf; | |
| 3383 ccv.value = &value[1]; | |
| 3384 ccv.complex_value = &flcf->cache_key; | |
| 3385 | |
| 3386 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) { | |
| 3387 return NGX_CONF_ERROR; | |
| 3388 } | |
| 3389 | |
| 3390 return NGX_CONF_OK; | |
| 3391 } | |
| 3392 | |
| 3393 #endif | |
| 3394 | |
| 3395 | |
|
1295
5383f5232364
proxy_store and fastcgi_store were changed,
Igor Sysoev <igor@sysoev.ru>
parents:
1291
diff
changeset
|
3396 static char * |
| 509 | 3397 ngx_http_fastcgi_lowat_check(ngx_conf_t *cf, void *post, void *data) |
| 3398 { | |
| 3399 #if (NGX_FREEBSD) | |
| 3400 ssize_t *np = data; | |
| 3401 | |
| 673 | 3402 if ((u_long) *np >= ngx_freebsd_net_inet_tcp_sendspace) { |
| 509 | 3403 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 3404 "\"fastcgi_send_lowat\" must be less than %d " | |
| 3405 "(sysctl net.inet.tcp.sendspace)", | |
| 3406 ngx_freebsd_net_inet_tcp_sendspace); | |
| 3407 | |
| 3408 return NGX_CONF_ERROR; | |
| 3409 } | |
| 3410 | |
| 3411 #elif !(NGX_HAVE_SO_SNDLOWAT) | |
| 3412 ssize_t *np = data; | |
| 3413 | |
| 3414 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | |
| 3415 "\"fastcgi_send_lowat\" is not supported, ignored"); | |
| 3416 | |
| 3417 *np = 0; | |
| 3418 | |
| 3419 #endif | |
| 3420 | |
| 3421 return NGX_CONF_OK; | |
| 3422 } |