Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 1352:e958b3cab51a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
--sysconfdir=DIR
author Igor Sysoev <igor@sysoev.ru>
date Sun, 29 Jul 2007 18:05:45 +0000
parents 8ef04207c84f
children 7443fbe0b013
comparison
equal deleted inserted replaced
1351:9ca095d36863 1352:e958b3cab51a
1221 == NULL) 1221 == NULL)
1222 { 1222 {
1223 return NULL; 1223 return NULL;
1224 } 1224 }
1225 1225
1226 if (ngx_conf_full_name((ngx_cycle_t *) ngx_cycle, path) == NGX_ERROR) { 1226 if (ngx_conf_full_name((ngx_cycle_t *) ngx_cycle, path, 0)== NGX_ERROR)
1227 {
1227 return NULL; 1228 return NULL;
1228 } 1229 }
1229 1230
1230 *root_length = path->len - reserved; 1231 *root_length = path->len - reserved;
1231 last = path->data + *root_length; 1232 last = path->data + *root_length;
1945 value = cf->args->elts; 1946 value = cf->args->elts;
1946 1947
1947 if (ngx_strcmp(value[0].data, "include") == 0) { 1948 if (ngx_strcmp(value[0].data, "include") == 0) {
1948 file = value[1]; 1949 file = value[1];
1949 1950
1950 if (ngx_conf_full_name(cf->cycle, &file) == NGX_ERROR){ 1951 if (ngx_conf_full_name(cf->cycle, &file, 1) == NGX_ERROR){
1951 return NGX_CONF_ERROR; 1952 return NGX_CONF_ERROR;
1952 } 1953 }
1953 1954
1954 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data); 1955 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
1955 1956
2288 2289
2289 if (prev->root.data == NULL) { 2290 if (prev->root.data == NULL) {
2290 conf->root.len = sizeof("html") - 1; 2291 conf->root.len = sizeof("html") - 1;
2291 conf->root.data = (u_char *) "html"; 2292 conf->root.data = (u_char *) "html";
2292 2293
2293 if (ngx_conf_full_name(cf->cycle, &conf->root) == NGX_ERROR) { 2294 if (ngx_conf_full_name(cf->cycle, &conf->root, 0) == NGX_ERROR) {
2294 return NGX_CONF_ERROR; 2295 return NGX_CONF_ERROR;
2295 } 2296 }
2296 } 2297 }
2297 } 2298 }
2298 2299
2737 if (!alias && lcf->root.data[lcf->root.len - 1] == '/') { 2738 if (!alias && lcf->root.data[lcf->root.len - 1] == '/') {
2738 lcf->root.len--; 2739 lcf->root.len--;
2739 } 2740 }
2740 2741
2741 if (lcf->root.data[0] != '$') { 2742 if (lcf->root.data[0] != '$') {
2742 if (ngx_conf_full_name(cf->cycle, &lcf->root) == NGX_ERROR) { 2743 if (ngx_conf_full_name(cf->cycle, &lcf->root, 0) == NGX_ERROR) {
2743 return NGX_CONF_ERROR; 2744 return NGX_CONF_ERROR;
2744 } 2745 }
2745 } 2746 }
2746 2747
2747 n = ngx_http_script_variables_count(&lcf->root); 2748 n = ngx_http_script_variables_count(&lcf->root);