Mercurial > hg > nginx

comparison src/http/modules/ngx_http_log_module.c @ 5330:314c3d7cc3a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out f1a91825730a and 7094bd12c1ff. While ngx_get_full_name() might have a bit more descriptive arguments, the ngx_conf_full_name() is generally easier to use when parsing configuration and limits exposure of cycle->prefix / cycle->conf_prefix details.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 20 Aug 2013 21:11:19 +0400
parents f1a91825730a
children 7094d6da2806
comparison
equal deleted inserted replaced
5329:00bdc9f08a16 5330:314c3d7cc3a5
1132 if (log->file == NULL) { 1132 if (log->file == NULL) {
1133 return NGX_CONF_ERROR; 1133 return NGX_CONF_ERROR;
1134 } 1134 }
1135 1135
1136 } else { 1136 } else {
1137 if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &value[1]) 1137 if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) {
1138 != NGX_OK)
1139 {
1140 return NGX_CONF_ERROR; 1138 return NGX_CONF_ERROR;
1141 } 1139 }
1142 1140
1143 log->script = ngx_pcalloc(cf->pool, sizeof(ngx_http_log_script_t)); 1141 log->script = ngx_pcalloc(cf->pool, sizeof(ngx_http_log_script_t));
1144 if (log->script == NULL) { 1142 if (log->script == NULL) {