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/modules/ngx_http_geo_module.c | |
| parent | 4c53a38fb59496e8280991b307a5fdfbd7f71040 (diff) | |
| download | nginx-e3cab7675801d224d1d5cdbe7f7b76bbaed97c91.tar.gz nginx-e3cab7675801d224d1d5cdbe7f7b76bbaed97c91.tar.bz2 | |
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/modules/ngx_http_geo_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_geo_module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c index 711871b6c..34c3b190d 100644 --- a/src/http/modules/ngx_http_geo_module.c +++ b/src/http/modules/ngx_http_geo_module.c @@ -1327,7 +1327,7 @@ ngx_http_geo_include(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx, ngx_sprintf(file.data, "%V.bin%Z", name); - if (ngx_get_full_name(cf->pool, &cf->cycle->conf_prefix, &file) != NGX_OK) { + if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) { return NGX_CONF_ERROR; } |