Mercurial > hg > nginx

comparison src/http/ngx_http_file_cache.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 654c1631dc86
comparison
equal deleted inserted replaced
5329:00bdc9f08a16 5330:314c3d7cc3a5
1624 1624
1625 if (cache->path->name.data[cache->path->name.len - 1] == '/') { 1625 if (cache->path->name.data[cache->path->name.len - 1] == '/') {
1626 cache->path->name.len--; 1626 cache->path->name.len--;
1627 } 1627 }
1628 1628
1629 if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &cache->path->name) 1629 if (ngx_conf_full_name(cf->cycle, &cache->path->name, 0) != NGX_OK) {
1630 != NGX_OK)
1631 {
1632 return NGX_CONF_ERROR; 1630 return NGX_CONF_ERROR;
1633 } 1631 }
1634 1632
1635 for (i = 2; i < cf->args->nelts; i++) { 1633 for (i = 2; i < cf->args->nelts; i++) {
1636 1634