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