diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2013-08-06 19:58:40 +0400 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2013-08-06 19:58:40 +0400 |
| commit | d29d21bade3a0fbe0e2d5d7e0e5546873c2ee588 (patch) | |
| tree | 26c5b0dc0e449c36f3df7a46d070a9e805c287ee /src/http/ngx_http_script.c | |
| parent | 3c5bd34771be032ef14e59f934058b3dce93588b (diff) | |
| download | nginx-d29d21bade3a0fbe0e2d5d7e0e5546873c2ee588.tar.gz nginx-d29d21bade3a0fbe0e2d5d7e0e5546873c2ee588.zip | |
Replaced ngx_conf_full_name() with ngx_get_full_name().
The ngx_get_full_name() function takes more readable arguments list.
Diffstat (limited to 'src/http/ngx_http_script.c')
| -rw-r--r-- | src/http/ngx_http_script.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c index 1da793b8f..7af48ee00 100644 --- 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_compile_complex_value_t *ccv) 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; } |