Mercurial > hg > nginx
comparison src/http/modules/ngx_http_fastcgi_module.c @ 4357:efd515ace6bb stable-1.0
Merge of r4270, r4274:
Minor cleanup:
*) Changed error message to be more appropriate in the imaginary
"open_file_cache max=0" case.
*) Fixed NGX_CONF_TAKE1/NGX_CONF_FLAG misuse.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 14 Dec 2011 14:31:55 +0000 |
parents | 37e5bf2b392d |
children | 94b995c7c614 |
comparison
equal
deleted
inserted
replaced
4356:c8695c991cb8 | 4357:efd515ace6bb |
---|---|
429 NGX_HTTP_LOC_CONF_OFFSET, | 429 NGX_HTTP_LOC_CONF_OFFSET, |
430 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.ignore_headers), | 430 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.ignore_headers), |
431 &ngx_http_upstream_ignore_headers_masks }, | 431 &ngx_http_upstream_ignore_headers_masks }, |
432 | 432 |
433 { ngx_string("fastcgi_catch_stderr"), | 433 { ngx_string("fastcgi_catch_stderr"), |
434 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | 434 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
435 ngx_conf_set_str_array_slot, | 435 ngx_conf_set_str_array_slot, |
436 NGX_HTTP_LOC_CONF_OFFSET, | 436 NGX_HTTP_LOC_CONF_OFFSET, |
437 offsetof(ngx_http_fastcgi_loc_conf_t, catch_stderr), | 437 offsetof(ngx_http_fastcgi_loc_conf_t, catch_stderr), |
438 NULL }, | 438 NULL }, |
439 | 439 |