Mercurial > hg > nginx-quic
comparison src/http/ngx_http_core_module.c @ 1725:0a174d921f1e stable-0.5
r1593, r1595 merge:
server_tokens
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 12 Dec 2007 20:53:06 +0000 |
parents | 9b047c9e96c1 |
children |
comparison
equal
deleted
inserted
replaced
1724:461d00e8a2a9 | 1725:0a174d921f1e |
---|---|
428 { ngx_string("recursive_error_pages"), | 428 { ngx_string("recursive_error_pages"), |
429 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | 429 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, |
430 ngx_conf_set_flag_slot, | 430 ngx_conf_set_flag_slot, |
431 NGX_HTTP_LOC_CONF_OFFSET, | 431 NGX_HTTP_LOC_CONF_OFFSET, |
432 offsetof(ngx_http_core_loc_conf_t, recursive_error_pages), | 432 offsetof(ngx_http_core_loc_conf_t, recursive_error_pages), |
433 NULL }, | |
434 | |
435 { ngx_string("server_tokens"), | |
436 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
437 ngx_conf_set_flag_slot, | |
438 NGX_HTTP_LOC_CONF_OFFSET, | |
439 offsetof(ngx_http_core_loc_conf_t, server_tokens), | |
433 NULL }, | 440 NULL }, |
434 | 441 |
435 { ngx_string("error_page"), | 442 { ngx_string("error_page"), |
436 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF | 443 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF |
437 |NGX_CONF_2MORE, | 444 |NGX_CONF_2MORE, |
2368 lcf->port_in_redirect = NGX_CONF_UNSET; | 2375 lcf->port_in_redirect = NGX_CONF_UNSET; |
2369 lcf->msie_padding = NGX_CONF_UNSET; | 2376 lcf->msie_padding = NGX_CONF_UNSET; |
2370 lcf->msie_refresh = NGX_CONF_UNSET; | 2377 lcf->msie_refresh = NGX_CONF_UNSET; |
2371 lcf->log_not_found = NGX_CONF_UNSET; | 2378 lcf->log_not_found = NGX_CONF_UNSET; |
2372 lcf->recursive_error_pages = NGX_CONF_UNSET; | 2379 lcf->recursive_error_pages = NGX_CONF_UNSET; |
2380 lcf->server_tokens = NGX_CONF_UNSET; | |
2373 lcf->types_hash_max_size = NGX_CONF_UNSET_UINT; | 2381 lcf->types_hash_max_size = NGX_CONF_UNSET_UINT; |
2374 lcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT; | 2382 lcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT; |
2375 | 2383 |
2376 return lcf; | 2384 return lcf; |
2377 } | 2385 } |
2552 ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1); | 2560 ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1); |
2553 ngx_conf_merge_value(conf->msie_refresh, prev->msie_refresh, 0); | 2561 ngx_conf_merge_value(conf->msie_refresh, prev->msie_refresh, 0); |
2554 ngx_conf_merge_value(conf->log_not_found, prev->log_not_found, 1); | 2562 ngx_conf_merge_value(conf->log_not_found, prev->log_not_found, 1); |
2555 ngx_conf_merge_value(conf->recursive_error_pages, | 2563 ngx_conf_merge_value(conf->recursive_error_pages, |
2556 prev->recursive_error_pages, 0); | 2564 prev->recursive_error_pages, 0); |
2565 ngx_conf_merge_value(conf->server_tokens, prev->server_tokens, 1); | |
2557 | 2566 |
2558 if (conf->open_files == NULL) { | 2567 if (conf->open_files == NULL) { |
2559 conf->open_files = prev->open_files; | 2568 conf->open_files = prev->open_files; |
2560 } | 2569 } |
2561 | 2570 |