diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-09-27 15:08:02 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-09-27 15:08:02 +0000 |
| commit | 2eec1e1ff2a0b2208efb4a86c40c468076c60d6b (patch) | |
| tree | a2c4dbf8a55d243f445cd473780930f055fd4ef8 /src/http/ngx_http_core_module.c | |
| parent | e52991ecbe61464294afe4d40d462fa96ebe3924 (diff) | |
| download | nginx-2eec1e1ff2a0b2208efb4a86c40c468076c60d6b.tar.gz nginx-2eec1e1ff2a0b2208efb4a86c40c468076c60d6b.zip | |
*) log_subrequest
*) flush variables in access log
Diffstat (limited to 'src/http/ngx_http_core_module.c')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 050f81e7f..ebd082f59 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -494,6 +494,13 @@ static ngx_command_t ngx_http_core_commands[] = { offsetof(ngx_http_core_loc_conf_t, log_not_found), NULL }, + { ngx_string("log_subrequest"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, + ngx_conf_set_flag_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_core_loc_conf_t, log_subrequest), + NULL }, + { ngx_string("recursive_error_pages"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, ngx_conf_set_flag_slot, @@ -2674,6 +2681,7 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf) lcf->msie_padding = NGX_CONF_UNSET; lcf->msie_refresh = NGX_CONF_UNSET; lcf->log_not_found = NGX_CONF_UNSET; + lcf->log_subrequest = NGX_CONF_UNSET; lcf->recursive_error_pages = NGX_CONF_UNSET; lcf->server_tokens = NGX_CONF_UNSET; lcf->types_hash_max_size = NGX_CONF_UNSET_UINT; @@ -2898,6 +2906,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1); ngx_conf_merge_value(conf->msie_refresh, prev->msie_refresh, 0); ngx_conf_merge_value(conf->log_not_found, prev->log_not_found, 1); + ngx_conf_merge_value(conf->log_subrequest, prev->log_subrequest, 0); ngx_conf_merge_value(conf->recursive_error_pages, prev->recursive_error_pages, 0); ngx_conf_merge_value(conf->server_tokens, prev->server_tokens, 1); |