]> git.kaiwu.me - nginx.git/commitdiff
test relative nginx.conf, this is compatible with old versions
authorIgor Sysoev <igor@sysoev.ru>
Mon, 20 Aug 2007 10:05:10 +0000 (10:05 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Mon, 20 Aug 2007 10:05:10 +0000 (10:05 +0000)
because cycle->root on this stage is not set

src/core/nginx.c

index 27cb80f851adceeab2a399f7f4edf15d49594805..579ee161bd7fec76c64c153781817973f5de4ce0 100644 (file)
@@ -656,10 +656,6 @@ ngx_getopt(ngx_cycle_t *cycle, int argc, char *const *argv)
         cycle->conf_file.data = (u_char *) NGX_CONF_PATH;
     }
 
-    if (ngx_conf_full_name(cycle, &cycle->conf_file, 1) == NGX_ERROR) {
-        return NGX_ERROR;
-    }
-
     return NGX_OK;
 }