Mercurial > hg > nginx

comparison src/http/ngx_http_script.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 e04083b79335
comparison
equal deleted inserted replaced
5329:00bdc9f08a16 5330:314c3d7cc3a5
129 } 129 }
130 130
131 if ((v->len == 0 || v->data[0] != '$') 131 if ((v->len == 0 || v->data[0] != '$')
132 && (ccv->conf_prefix || ccv->root_prefix)) 132 && (ccv->conf_prefix || ccv->root_prefix))
133 { 133 {
134 if (ngx_get_full_name(ccv->cf->pool, 134 if (ngx_conf_full_name(ccv->cf->cycle, v, ccv->conf_prefix) != NGX_OK) {
135 ccv->conf_prefix ? &ccv->cf->cycle->conf_prefix:
136 &ccv->cf->cycle->prefix,
137 v)
138 != NGX_OK)
139 {
140 return NGX_ERROR; 135 return NGX_ERROR;
141 } 136 }
142 137
143 ccv->conf_prefix = 0; 138 ccv->conf_prefix = 0;
144 ccv->root_prefix = 0; 139 ccv->root_prefix = 0;