comparison src/http/ngx_http_core_module.c @ 1772:25c93614e6b9

open_file_cache_min_uses
author Igor Sysoev <igor@sysoev.ru>
date Sat, 22 Dec 2007 13:19:39 +0000
parents c42431762903
children 74840e606733
comparison
equal deleted inserted replaced
1771:b794d78e52c5 1772:25c93614e6b9
488 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 488 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
489 ngx_conf_set_sec_slot, 489 ngx_conf_set_sec_slot,
490 NGX_HTTP_LOC_CONF_OFFSET, 490 NGX_HTTP_LOC_CONF_OFFSET,
491 offsetof(ngx_http_core_loc_conf_t, open_file_cache_valid), 491 offsetof(ngx_http_core_loc_conf_t, open_file_cache_valid),
492 &ngx_conf_deprecated_open_file_cache_retest }, 492 &ngx_conf_deprecated_open_file_cache_retest },
493
494 { ngx_string("open_file_cache_min_uses"),
495 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
496 ngx_conf_set_num_slot,
497 NGX_HTTP_LOC_CONF_OFFSET,
498 offsetof(ngx_http_core_loc_conf_t, open_file_cache_min_uses),
499 NULL },
493 500
494 { ngx_string("open_file_cache_errors"), 501 { ngx_string("open_file_cache_errors"),
495 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 502 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
496 ngx_conf_set_flag_slot, 503 ngx_conf_set_flag_slot,
497 NGX_HTTP_LOC_CONF_OFFSET, 504 NGX_HTTP_LOC_CONF_OFFSET,
2427 lcf->server_tokens = NGX_CONF_UNSET; 2434 lcf->server_tokens = NGX_CONF_UNSET;
2428 lcf->types_hash_max_size = NGX_CONF_UNSET_UINT; 2435 lcf->types_hash_max_size = NGX_CONF_UNSET_UINT;
2429 lcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT; 2436 lcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT;
2430 lcf->open_file_cache = NGX_CONF_UNSET_PTR; 2437 lcf->open_file_cache = NGX_CONF_UNSET_PTR;
2431 lcf->open_file_cache_valid = NGX_CONF_UNSET; 2438 lcf->open_file_cache_valid = NGX_CONF_UNSET;
2439 lcf->open_file_cache_min_uses = NGX_CONF_UNSET_UINT;
2432 lcf->open_file_cache_errors = NGX_CONF_UNSET; 2440 lcf->open_file_cache_errors = NGX_CONF_UNSET;
2433 lcf->open_file_cache_events = NGX_CONF_UNSET; 2441 lcf->open_file_cache_events = NGX_CONF_UNSET;
2434 2442
2435 return lcf; 2443 return lcf;
2436 } 2444 }
2631 ngx_conf_merge_ptr_value(conf->open_file_cache, 2639 ngx_conf_merge_ptr_value(conf->open_file_cache,
2632 prev->open_file_cache, NULL); 2640 prev->open_file_cache, NULL);
2633 2641
2634 ngx_conf_merge_sec_value(conf->open_file_cache_valid, 2642 ngx_conf_merge_sec_value(conf->open_file_cache_valid,
2635 prev->open_file_cache_valid, 60); 2643 prev->open_file_cache_valid, 60);
2644
2645 ngx_conf_merge_uint_value(conf->open_file_cache_min_uses,
2646 prev->open_file_cache_min_uses, 1);
2636 2647
2637 ngx_conf_merge_sec_value(conf->open_file_cache_errors, 2648 ngx_conf_merge_sec_value(conf->open_file_cache_errors,
2638 prev->open_file_cache_errors, 0); 2649 prev->open_file_cache_errors, 0);
2639 2650
2640 ngx_conf_merge_sec_value(conf->open_file_cache_events, 2651 ngx_conf_merge_sec_value(conf->open_file_cache_events,