From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 20 Aug 2007 10:05:10 +0000 (+0000)
Subject: test relative nginx.conf, this is compatible with old versions
X-Git-Tag: release-0.6.8~2
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=3854a1e195d776818475a52e5e1ce63cbda5f99a;p=nginx.git

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
index 27cb80f85..579ee161b 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -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;
 }