Mercurial > hg > nginx

comparison src/http/modules/ngx_http_geo_module.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 c5ec6944de98
comparison
equal deleted inserted replaced
5329:00bdc9f08a16 5330:314c3d7cc3a5
1325 return NGX_CONF_ERROR; 1325 return NGX_CONF_ERROR;
1326 } 1326 }
1327 1327
1328 ngx_sprintf(file.data, "%V.bin%Z", name); 1328 ngx_sprintf(file.data, "%V.bin%Z", name);
1329 1329
1330 if (ngx_get_full_name(cf->pool, &cf->cycle->conf_prefix, &file) != NGX_OK) { 1330 if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) {
1331 return NGX_CONF_ERROR; 1331 return NGX_CONF_ERROR;
1332 } 1332 }
1333 1333
1334 if (ctx->ranges) { 1334 if (ctx->ranges) {
1335 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data); 1335 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);