Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 5317:f1a91825730a
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 | 12dd27b74117 |
children | 314c3d7cc3a5 |
comparison
equal
deleted
inserted
replaced
5316:12dd27b74117 | 5317:f1a91825730a |
---|---|
3684 conf->root_values = prev->root_values; | 3684 conf->root_values = prev->root_values; |
3685 | 3685 |
3686 if (prev->root.data == NULL) { | 3686 if (prev->root.data == NULL) { |
3687 ngx_str_set(&conf->root, "html"); | 3687 ngx_str_set(&conf->root, "html"); |
3688 | 3688 |
3689 if (ngx_conf_full_name(cf->cycle, &conf->root, 0) != NGX_OK) { | 3689 if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &conf->root) |
3690 != NGX_OK) | |
3691 { | |
3690 return NGX_CONF_ERROR; | 3692 return NGX_CONF_ERROR; |
3691 } | 3693 } |
3692 } | 3694 } |
3693 } | 3695 } |
3694 | 3696 |
4426 if (!alias && clcf->root.data[clcf->root.len - 1] == '/') { | 4428 if (!alias && clcf->root.data[clcf->root.len - 1] == '/') { |
4427 clcf->root.len--; | 4429 clcf->root.len--; |
4428 } | 4430 } |
4429 | 4431 |
4430 if (clcf->root.data[0] != '$') { | 4432 if (clcf->root.data[0] != '$') { |
4431 if (ngx_conf_full_name(cf->cycle, &clcf->root, 0) != NGX_OK) { | 4433 if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &clcf->root) |
4434 != NGX_OK) | |
4435 { | |
4432 return NGX_CONF_ERROR; | 4436 return NGX_CONF_ERROR; |
4433 } | 4437 } |
4434 } | 4438 } |
4435 | 4439 |
4436 n = ngx_http_script_variables_count(&clcf->root); | 4440 n = ngx_http_script_variables_count(&clcf->root); |