Mercurial > hg > nginx

comparison src/http/modules/ngx_http_geo_module.c @ 5317:f1a91825730a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replaced ngx_conf_full_name() with ngx_get_full_name(). The ngx_get_full_name() function takes more readable arguments list.
author Valentin Bartenev <vbart@nginx.com>
date Tue, 06 Aug 2013 19:58:40 +0400
parents 5482671df278
children 314c3d7cc3a5
comparison
equal deleted inserted replaced
5316:12dd27b74117 5317:f1a91825730a
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_conf_full_name(cf->cycle, &file, 1) != NGX_OK) { 1330 if (ngx_get_full_name(cf->pool, &cf->cycle->conf_prefix, &file) != 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);