Mercurial > hg > nginx

comparison src/core/nginx.c @ 1407:6e99e8c71bde

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test relative nginx.conf, this is compatible with old versions because cycle->root on this stage is not set
author Igor Sysoev <igor@sysoev.ru>
date Mon, 20 Aug 2007 10:05:10 +0000
parents e958b3cab51a
children 8c696afe46b3
comparison
equal deleted inserted replaced
1406:03341711f9a2 1407:6e99e8c71bde
654 if (cycle->conf_file.data == NULL) { 654 if (cycle->conf_file.data == NULL) {
655 cycle->conf_file.len = sizeof(NGX_CONF_PATH) - 1; 655 cycle->conf_file.len = sizeof(NGX_CONF_PATH) - 1;
656 cycle->conf_file.data = (u_char *) NGX_CONF_PATH; 656 cycle->conf_file.data = (u_char *) NGX_CONF_PATH;
657 } 657 }
658 658
659 if (ngx_conf_full_name(cycle, &cycle->conf_file, 1) == NGX_ERROR) {
660 return NGX_ERROR;
661 }
662
663 return NGX_OK; 659 return NGX_OK;
664 } 660 }
665 661
666 662
667 static ngx_int_t 663 static ngx_int_t