diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-08-20 21:11:19 +0400 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-08-20 21:11:19 +0400 |
| commit | e3cab7675801d224d1d5cdbe7f7b76bbaed97c91 (patch) | |
| tree | 4d26e1efc552059730fa76391c9e9834d8e38cbe /src/http/ngx_http_script.c | |
| parent | 4c53a38fb59496e8280991b307a5fdfbd7f71040 (diff) | |
| download | nginx-e3cab7675801d224d1d5cdbe7f7b76bbaed97c91.tar.gz nginx-e3cab7675801d224d1d5cdbe7f7b76bbaed97c91.zip | |
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.
Diffstat (limited to 'src/http/ngx_http_script.c')
| -rw-r--r-- | src/http/ngx_http_script.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c index 7af48ee00..1da793b8f 100644 --- a/src/http/ngx_http_script.c +++ b/src/http/ngx_http_script.c @@ -131,12 +131,7 @@ 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_get_full_name(ccv->cf->pool, - ccv->conf_prefix ? &ccv->cf->cycle->conf_prefix: - &ccv->cf->cycle->prefix, - v) - != NGX_OK) - { + if (ngx_conf_full_name(ccv->cf->cycle, v, ccv->conf_prefix) != NGX_OK) { return NGX_ERROR; } |