Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 1592:128ea9efb824

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
server_tokens
author Igor Sysoev <igor@sysoev.ru>
date Mon, 22 Oct 2007 10:17:34 +0000
parents 135202406b0c
children cc7a7d0b89e8
comparison
equal deleted inserted replaced
1591:135202406b0c 1592:128ea9efb824
430 { ngx_string("recursive_error_pages"), 430 { ngx_string("recursive_error_pages"),
431 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 431 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
432 ngx_conf_set_flag_slot, 432 ngx_conf_set_flag_slot,
433 NGX_HTTP_LOC_CONF_OFFSET, 433 NGX_HTTP_LOC_CONF_OFFSET,
434 offsetof(ngx_http_core_loc_conf_t, recursive_error_pages), 434 offsetof(ngx_http_core_loc_conf_t, recursive_error_pages),
435 NULL },
436
437 { ngx_string("server_tokens"),
438 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
439 ngx_conf_set_flag_slot,
440 NGX_HTTP_LOC_CONF_OFFSET,
441 offsetof(ngx_http_core_loc_conf_t, server_tokens),
435 NULL }, 442 NULL },
436 443
437 { ngx_string("error_page"), 444 { ngx_string("error_page"),
438 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF 445 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
439 |NGX_CONF_2MORE, 446 |NGX_CONF_2MORE,
2388 lcf->port_in_redirect = NGX_CONF_UNSET; 2395 lcf->port_in_redirect = NGX_CONF_UNSET;
2389 lcf->msie_padding = NGX_CONF_UNSET; 2396 lcf->msie_padding = NGX_CONF_UNSET;
2390 lcf->msie_refresh = NGX_CONF_UNSET; 2397 lcf->msie_refresh = NGX_CONF_UNSET;
2391 lcf->log_not_found = NGX_CONF_UNSET; 2398 lcf->log_not_found = NGX_CONF_UNSET;
2392 lcf->recursive_error_pages = NGX_CONF_UNSET; 2399 lcf->recursive_error_pages = NGX_CONF_UNSET;
2400 lcf->server_tokens = NGX_CONF_UNSET;
2393 lcf->types_hash_max_size = NGX_CONF_UNSET_UINT; 2401 lcf->types_hash_max_size = NGX_CONF_UNSET_UINT;
2394 lcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT; 2402 lcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT;
2395 lcf->open_file_cache = NGX_CONF_UNSET_PTR; 2403 lcf->open_file_cache = NGX_CONF_UNSET_PTR;
2396 lcf->open_file_cache_retest = NGX_CONF_UNSET; 2404 lcf->open_file_cache_retest = NGX_CONF_UNSET;
2397 lcf->open_file_cache_errors = NGX_CONF_UNSET; 2405 lcf->open_file_cache_errors = NGX_CONF_UNSET;
2576 ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1); 2584 ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1);
2577 ngx_conf_merge_value(conf->msie_refresh, prev->msie_refresh, 0); 2585 ngx_conf_merge_value(conf->msie_refresh, prev->msie_refresh, 0);
2578 ngx_conf_merge_value(conf->log_not_found, prev->log_not_found, 1); 2586 ngx_conf_merge_value(conf->log_not_found, prev->log_not_found, 1);
2579 ngx_conf_merge_value(conf->recursive_error_pages, 2587 ngx_conf_merge_value(conf->recursive_error_pages,
2580 prev->recursive_error_pages, 0); 2588 prev->recursive_error_pages, 0);
2589 ngx_conf_merge_value(conf->server_tokens, prev->server_tokens, 1);
2581 2590
2582 ngx_conf_merge_ptr_value(conf->open_file_cache, 2591 ngx_conf_merge_ptr_value(conf->open_file_cache,
2583 prev->open_file_cache, NULL); 2592 prev->open_file_cache, NULL);
2584 2593
2585 ngx_conf_merge_sec_value(conf->open_file_cache_retest, 2594 ngx_conf_merge_sec_value(conf->open_file_cache_retest,