Mercurial > hg > nginx
diff src/http/ngx_http_script.c @ 5317:f1a91825730a
Replaced ngx_conf_full_name() with ngx_get_full_name().
The ngx_get_full_name() function takes more readable arguments list.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Tue, 06 Aug 2013 19:58:40 +0400 |
parents | 12dd27b74117 |
children | 314c3d7cc3a5 |
line wrap: on
line diff
--- a/src/http/ngx_http_script.c +++ b/src/http/ngx_http_script.c @@ -131,7 +131,12 @@ ngx_http_compile_complex_value(ngx_http_ if ((v->len == 0 || v->data[0] != '$') && (ccv->conf_prefix || ccv->root_prefix)) { - if (ngx_conf_full_name(ccv->cf->cycle, v, ccv->conf_prefix) != NGX_OK) { + if (ngx_get_full_name(ccv->cf->pool, + ccv->conf_prefix ? &ccv->cf->cycle->conf_prefix: + &ccv->cf->cycle->prefix, + v) + != NGX_OK) + { return NGX_ERROR; }