Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 1767:c42431762903

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
open_file_cache_retest > open_file_cache_valid
author Igor Sysoev <igor@sysoev.ru>
date Fri, 21 Dec 2007 16:19:48 +0000
parents e584e946e198
children 25c93614e6b9
comparison
equal deleted inserted replaced
1766:111eb827ed44 1767:c42431762903
83 83
84 static ngx_conf_deprecated_t ngx_conf_deprecated_optimize_host_names = { 84 static ngx_conf_deprecated_t ngx_conf_deprecated_optimize_host_names = {
85 ngx_conf_deprecated, "optimize_host_names", "optimize_server_names" 85 ngx_conf_deprecated, "optimize_host_names", "optimize_server_names"
86 }; 86 };
87 87
88 static ngx_conf_deprecated_t ngx_conf_deprecated_open_file_cache_retest = {
89 ngx_conf_deprecated, "open_file_cache_retest", "open_file_cache_valid"
90 };
91
88 92
89 static ngx_conf_enum_t ngx_http_core_request_body_in_file[] = { 93 static ngx_conf_enum_t ngx_http_core_request_body_in_file[] = {
90 { ngx_string("off"), NGX_HTTP_REQUEST_BODY_FILE_OFF }, 94 { ngx_string("off"), NGX_HTTP_REQUEST_BODY_FILE_OFF },
91 { ngx_string("on"), NGX_HTTP_REQUEST_BODY_FILE_ON }, 95 { ngx_string("on"), NGX_HTTP_REQUEST_BODY_FILE_ON },
92 { ngx_string("clean"), NGX_HTTP_REQUEST_BODY_FILE_CLEAN }, 96 { ngx_string("clean"), NGX_HTTP_REQUEST_BODY_FILE_CLEAN },
471 ngx_http_core_open_file_cache, 475 ngx_http_core_open_file_cache,
472 NGX_HTTP_LOC_CONF_OFFSET, 476 NGX_HTTP_LOC_CONF_OFFSET,
473 offsetof(ngx_http_core_loc_conf_t, open_file_cache), 477 offsetof(ngx_http_core_loc_conf_t, open_file_cache),
474 NULL }, 478 NULL },
475 479
480 { ngx_string("open_file_cache_valid"),
481 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
482 ngx_conf_set_sec_slot,
483 NGX_HTTP_LOC_CONF_OFFSET,
484 offsetof(ngx_http_core_loc_conf_t, open_file_cache_valid),
485 NULL },
486
476 { ngx_string("open_file_cache_retest"), 487 { ngx_string("open_file_cache_retest"),
477 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,
478 ngx_conf_set_sec_slot, 489 ngx_conf_set_sec_slot,
479 NGX_HTTP_LOC_CONF_OFFSET, 490 NGX_HTTP_LOC_CONF_OFFSET,
480 offsetof(ngx_http_core_loc_conf_t, open_file_cache_retest), 491 offsetof(ngx_http_core_loc_conf_t, open_file_cache_valid),
481 NULL }, 492 &ngx_conf_deprecated_open_file_cache_retest },
482 493
483 { ngx_string("open_file_cache_errors"), 494 { ngx_string("open_file_cache_errors"),
484 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 495 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
485 ngx_conf_set_flag_slot, 496 ngx_conf_set_flag_slot,
486 NGX_HTTP_LOC_CONF_OFFSET, 497 NGX_HTTP_LOC_CONF_OFFSET,
2415 lcf->recursive_error_pages = NGX_CONF_UNSET; 2426 lcf->recursive_error_pages = NGX_CONF_UNSET;
2416 lcf->server_tokens = NGX_CONF_UNSET; 2427 lcf->server_tokens = NGX_CONF_UNSET;
2417 lcf->types_hash_max_size = NGX_CONF_UNSET_UINT; 2428 lcf->types_hash_max_size = NGX_CONF_UNSET_UINT;
2418 lcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT; 2429 lcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT;
2419 lcf->open_file_cache = NGX_CONF_UNSET_PTR; 2430 lcf->open_file_cache = NGX_CONF_UNSET_PTR;
2420 lcf->open_file_cache_retest = NGX_CONF_UNSET; 2431 lcf->open_file_cache_valid = NGX_CONF_UNSET;
2421 lcf->open_file_cache_errors = NGX_CONF_UNSET; 2432 lcf->open_file_cache_errors = NGX_CONF_UNSET;
2422 lcf->open_file_cache_events = NGX_CONF_UNSET; 2433 lcf->open_file_cache_events = NGX_CONF_UNSET;
2423 2434
2424 return lcf; 2435 return lcf;
2425 } 2436 }
2618 ngx_conf_merge_value(conf->server_tokens, prev->server_tokens, 1); 2629 ngx_conf_merge_value(conf->server_tokens, prev->server_tokens, 1);
2619 2630
2620 ngx_conf_merge_ptr_value(conf->open_file_cache, 2631 ngx_conf_merge_ptr_value(conf->open_file_cache,
2621 prev->open_file_cache, NULL); 2632 prev->open_file_cache, NULL);
2622 2633
2623 ngx_conf_merge_sec_value(conf->open_file_cache_retest, 2634 ngx_conf_merge_sec_value(conf->open_file_cache_valid,
2624 prev->open_file_cache_retest, 60); 2635 prev->open_file_cache_valid, 60);
2625 2636
2626 ngx_conf_merge_sec_value(conf->open_file_cache_errors, 2637 ngx_conf_merge_sec_value(conf->open_file_cache_errors,
2627 prev->open_file_cache_errors, 0); 2638 prev->open_file_cache_errors, 0);
2628 2639
2629 ngx_conf_merge_sec_value(conf->open_file_cache_events, 2640 ngx_conf_merge_sec_value(conf->open_file_cache_events,