Mercurial > hg > nginx
comparison src/core/nginx.c @ 1352:e958b3cab51a
--sysconfdir=DIR
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sun, 29 Jul 2007 18:05:45 +0000 |
parents | 114428c61a3a |
children | 6e99e8c71bde |
comparison
equal
deleted
inserted
replaced
1351:9ca095d36863 | 1352:e958b3cab51a |
---|---|
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) == NGX_ERROR) { | 659 if (ngx_conf_full_name(cycle, &cycle->conf_file, 1) == NGX_ERROR) { |
660 return NGX_ERROR; | 660 return NGX_ERROR; |
661 } | 661 } |
662 | 662 |
663 return NGX_OK; | 663 return NGX_OK; |
664 } | 664 } |
824 if (ccf->pid.len == 0) { | 824 if (ccf->pid.len == 0) { |
825 ccf->pid.len = sizeof(NGX_PID_PATH) - 1; | 825 ccf->pid.len = sizeof(NGX_PID_PATH) - 1; |
826 ccf->pid.data = (u_char *) NGX_PID_PATH; | 826 ccf->pid.data = (u_char *) NGX_PID_PATH; |
827 } | 827 } |
828 | 828 |
829 if (ngx_conf_full_name(cycle, &ccf->pid) == NGX_ERROR) { | 829 if (ngx_conf_full_name(cycle, &ccf->pid, 0) == NGX_ERROR) { |
830 return NGX_CONF_ERROR; | 830 return NGX_CONF_ERROR; |
831 } | 831 } |
832 | 832 |
833 ccf->oldpid.len = ccf->pid.len + sizeof(NGX_OLDPID_EXT); | 833 ccf->oldpid.len = ccf->pid.len + sizeof(NGX_OLDPID_EXT); |
834 | 834 |
844 if (ccf->lock_file.len == 0) { | 844 if (ccf->lock_file.len == 0) { |
845 ccf->lock_file.len = sizeof(NGX_LOCK_PATH) - 1; | 845 ccf->lock_file.len = sizeof(NGX_LOCK_PATH) - 1; |
846 ccf->lock_file.data = (u_char *) NGX_LOCK_PATH; | 846 ccf->lock_file.data = (u_char *) NGX_LOCK_PATH; |
847 } | 847 } |
848 | 848 |
849 if (ngx_conf_full_name(cycle, &ccf->lock_file) == NGX_ERROR) { | 849 if (ngx_conf_full_name(cycle, &ccf->lock_file, 0) == NGX_ERROR) { |
850 return NGX_CONF_ERROR; | 850 return NGX_CONF_ERROR; |
851 } | 851 } |
852 | 852 |
853 lock_file = cycle->old_cycle->lock_file; | 853 lock_file = cycle->old_cycle->lock_file; |
854 | 854 |