Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 1780:74840e606733
style fix
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 27 Dec 2007 08:40:14 +0000 |
parents | 25c93614e6b9 |
children | bfb66d7c2b42 |
comparison
equal
deleted
inserted
replaced
1779:06014cfdb5b1 | 1780:74840e606733 |
---|---|
2635 ngx_conf_merge_value(conf->recursive_error_pages, | 2635 ngx_conf_merge_value(conf->recursive_error_pages, |
2636 prev->recursive_error_pages, 0); | 2636 prev->recursive_error_pages, 0); |
2637 ngx_conf_merge_value(conf->server_tokens, prev->server_tokens, 1); | 2637 ngx_conf_merge_value(conf->server_tokens, prev->server_tokens, 1); |
2638 | 2638 |
2639 ngx_conf_merge_ptr_value(conf->open_file_cache, | 2639 ngx_conf_merge_ptr_value(conf->open_file_cache, |
2640 prev->open_file_cache, NULL); | 2640 prev->open_file_cache, NULL); |
2641 | 2641 |
2642 ngx_conf_merge_sec_value(conf->open_file_cache_valid, | 2642 ngx_conf_merge_sec_value(conf->open_file_cache_valid, |
2643 prev->open_file_cache_valid, 60); | 2643 prev->open_file_cache_valid, 60); |
2644 | 2644 |
2645 ngx_conf_merge_uint_value(conf->open_file_cache_min_uses, | 2645 ngx_conf_merge_uint_value(conf->open_file_cache_min_uses, |
2646 prev->open_file_cache_min_uses, 1); | 2646 prev->open_file_cache_min_uses, 1); |
2647 | 2647 |
2648 ngx_conf_merge_sec_value(conf->open_file_cache_errors, | 2648 ngx_conf_merge_sec_value(conf->open_file_cache_errors, |
2649 prev->open_file_cache_errors, 0); | 2649 prev->open_file_cache_errors, 0); |
2650 | 2650 |
2651 ngx_conf_merge_sec_value(conf->open_file_cache_events, | 2651 ngx_conf_merge_sec_value(conf->open_file_cache_events, |
2652 prev->open_file_cache_events, 0); | 2652 prev->open_file_cache_events, 0); |
2653 | 2653 |
2654 return NGX_CONF_OK; | 2654 return NGX_CONF_OK; |
2655 } | 2655 } |
2656 | 2656 |
2657 | 2657 |