Mercurial > hg > nginx
comparison src/http/modules/ngx_http_fastcgi_module.c @ 1291:13a4ce6e7f1e
proxy_store and fastcgi_store
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 12 Jul 2007 11:19:05 +0000 |
parents | 1494a23b1ed4 |
children | 5383f5232364 |
comparison
equal
deleted
inserted
replaced
1290:4e6903652363 | 1291:13a4ce6e7f1e |
---|---|
196 { ngx_string("fastcgi_index"), | 196 { ngx_string("fastcgi_index"), |
197 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | 197 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
198 ngx_conf_set_str_slot, | 198 ngx_conf_set_str_slot, |
199 NGX_HTTP_LOC_CONF_OFFSET, | 199 NGX_HTTP_LOC_CONF_OFFSET, |
200 offsetof(ngx_http_fastcgi_loc_conf_t, index), | 200 offsetof(ngx_http_fastcgi_loc_conf_t, index), |
201 NULL }, | |
202 | |
203 { ngx_string("fastcgi_store"), | |
204 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE123, | |
205 ngx_conf_set_access_slot, | |
206 NGX_HTTP_LOC_CONF_OFFSET, | |
207 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.store), | |
201 NULL }, | 208 NULL }, |
202 | 209 |
203 { ngx_string("fastcgi_ignore_client_abort"), | 210 { ngx_string("fastcgi_ignore_client_abort"), |
204 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | 211 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, |
205 ngx_conf_set_flag_slot, | 212 ngx_conf_set_flag_slot, |
1631 * | 1638 * |
1632 * conf->index.len = 0; | 1639 * conf->index.len = 0; |
1633 * conf->index.data = NULL; | 1640 * conf->index.data = NULL; |
1634 */ | 1641 */ |
1635 | 1642 |
1643 conf->upstream.store = NGX_CONF_UNSET_UINT; | |
1636 conf->upstream.buffering = NGX_CONF_UNSET; | 1644 conf->upstream.buffering = NGX_CONF_UNSET; |
1637 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; | 1645 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; |
1638 | 1646 |
1639 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; | 1647 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; |
1640 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; | 1648 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; |
1675 ngx_hash_key_t *hk; | 1683 ngx_hash_key_t *hk; |
1676 ngx_hash_init_t hash; | 1684 ngx_hash_init_t hash; |
1677 ngx_http_script_compile_t sc; | 1685 ngx_http_script_compile_t sc; |
1678 ngx_http_script_copy_code_t *copy; | 1686 ngx_http_script_copy_code_t *copy; |
1679 | 1687 |
1688 ngx_conf_merge_uint_value(conf->upstream.store, | |
1689 prev->upstream.store, 0); | |
1690 | |
1680 ngx_conf_merge_value(conf->upstream.buffering, | 1691 ngx_conf_merge_value(conf->upstream.buffering, |
1681 prev->upstream.buffering, 1); | 1692 prev->upstream.buffering, 1); |
1682 | 1693 |
1683 ngx_conf_merge_value(conf->upstream.ignore_client_abort, | 1694 ngx_conf_merge_value(conf->upstream.ignore_client_abort, |
1684 prev->upstream.ignore_client_abort, 0); | 1695 prev->upstream.ignore_client_abort, 0); |