# HG changeset patch # User Igor Sysoev # Date 1187604310 0 # Node ID 6e99e8c71bde754bbfeb3c9f5e93ddc1bdf0aca0 # Parent 03341711f9a266d804b9b0b52583ba422711f0da test relative nginx.conf, this is compatible with old versions because cycle->root on this stage is not set diff --git a/src/core/nginx.c b/src/core/nginx.c --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -656,10 +656,6 @@ ngx_getopt(ngx_cycle_t *cycle, int argc, 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; }