From: Maxim Dounin <mdounin@mdounin.ru>
Date: Mon, 24 Sep 2012 18:50:25 +0000 (+0000)
Subject: Merge of r4784: fixed the -p parameter handling.
X-Git-Tag: release-1.2.4~10
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=f8c0690d379ad745fe3a7e7f53548964278ce094;p=nginx.git

Merge of r4784: fixed the -p parameter handling.

Ensure that the path supplied always ends with a `/' except when empty.
An empty value now corresponds to the current directory instead of `/'.
---

diff --git a/src/core/nginx.c b/src/core/nginx.c
index f21e77d30..c7f84fd67 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -836,7 +836,7 @@ ngx_process_options(ngx_cycle_t *cycle)
         len = ngx_strlen(ngx_prefix);
         p = ngx_prefix;
 
-        if (!ngx_path_separator(*p)) {
+        if (len && !ngx_path_separator(p[len - 1])) {
             p = ngx_pnalloc(cycle->pool, len + 1);
             if (p == NULL) {
                 return NGX_ERROR;