Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 2261:07bf557a2e40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*) log_subrequest *) flush variables in access log
author Igor Sysoev <igor@sysoev.ru>
date Sat, 27 Sep 2008 15:08:02 +0000
parents 8c17cfe63d2c
children 41b51261b726
comparison
equal deleted inserted replaced
2260:4f1616b32744 2261:07bf557a2e40
490 { ngx_string("log_not_found"), 490 { ngx_string("log_not_found"),
491 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 491 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
492 ngx_conf_set_flag_slot, 492 ngx_conf_set_flag_slot,
493 NGX_HTTP_LOC_CONF_OFFSET, 493 NGX_HTTP_LOC_CONF_OFFSET,
494 offsetof(ngx_http_core_loc_conf_t, log_not_found), 494 offsetof(ngx_http_core_loc_conf_t, log_not_found),
495 NULL },
496
497 { ngx_string("log_subrequest"),
498 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
499 ngx_conf_set_flag_slot,
500 NGX_HTTP_LOC_CONF_OFFSET,
501 offsetof(ngx_http_core_loc_conf_t, log_subrequest),
495 NULL }, 502 NULL },
496 503
497 { ngx_string("recursive_error_pages"), 504 { ngx_string("recursive_error_pages"),
498 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 505 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
499 ngx_conf_set_flag_slot, 506 ngx_conf_set_flag_slot,
2672 lcf->server_name_in_redirect = NGX_CONF_UNSET; 2679 lcf->server_name_in_redirect = NGX_CONF_UNSET;
2673 lcf->port_in_redirect = NGX_CONF_UNSET; 2680 lcf->port_in_redirect = NGX_CONF_UNSET;
2674 lcf->msie_padding = NGX_CONF_UNSET; 2681 lcf->msie_padding = NGX_CONF_UNSET;
2675 lcf->msie_refresh = NGX_CONF_UNSET; 2682 lcf->msie_refresh = NGX_CONF_UNSET;
2676 lcf->log_not_found = NGX_CONF_UNSET; 2683 lcf->log_not_found = NGX_CONF_UNSET;
2684 lcf->log_subrequest = NGX_CONF_UNSET;
2677 lcf->recursive_error_pages = NGX_CONF_UNSET; 2685 lcf->recursive_error_pages = NGX_CONF_UNSET;
2678 lcf->server_tokens = NGX_CONF_UNSET; 2686 lcf->server_tokens = NGX_CONF_UNSET;
2679 lcf->types_hash_max_size = NGX_CONF_UNSET_UINT; 2687 lcf->types_hash_max_size = NGX_CONF_UNSET_UINT;
2680 lcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT; 2688 lcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT;
2681 2689
2896 prev->server_name_in_redirect, 1); 2904 prev->server_name_in_redirect, 1);
2897 ngx_conf_merge_value(conf->port_in_redirect, prev->port_in_redirect, 1); 2905 ngx_conf_merge_value(conf->port_in_redirect, prev->port_in_redirect, 1);
2898 ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1); 2906 ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1);
2899 ngx_conf_merge_value(conf->msie_refresh, prev->msie_refresh, 0); 2907 ngx_conf_merge_value(conf->msie_refresh, prev->msie_refresh, 0);
2900 ngx_conf_merge_value(conf->log_not_found, prev->log_not_found, 1); 2908 ngx_conf_merge_value(conf->log_not_found, prev->log_not_found, 1);
2909 ngx_conf_merge_value(conf->log_subrequest, prev->log_subrequest, 0);
2901 ngx_conf_merge_value(conf->recursive_error_pages, 2910 ngx_conf_merge_value(conf->recursive_error_pages,
2902 prev->recursive_error_pages, 0); 2911 prev->recursive_error_pages, 0);
2903 ngx_conf_merge_value(conf->server_tokens, prev->server_tokens, 1); 2912 ngx_conf_merge_value(conf->server_tokens, prev->server_tokens, 1);
2904 2913
2905 ngx_conf_merge_ptr_value(conf->open_file_cache, 2914 ngx_conf_merge_ptr_value(conf->open_file_cache,