[nginx] svn commit: r4852 - in branches/stable-1.2: . src/core

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-09-24 18:50:25 +0000 (Mon, 24 Sep 2012)
New Revision: 4852
URL: http://trac.nginx.org/nginx/changeset/4852/nginx

Log:
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 `/'.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/core/nginx.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-09-24 18:46:50 UTC (rev 4851)
+++ branches/stable-1.2	2012-09-24 18:50:25 UTC (rev 4852)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4783,4824,4830-4832,4834,4840,4842-4844
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4784,4824,4830-4832,4834,4840,4842-4844
\ No newline at end of property
Modified: branches/stable-1.2/src/core/nginx.c
===================================================================
--- branches/stable-1.2/src/core/nginx.c	2012-09-24 18:46:50 UTC (rev 4851)
+++ branches/stable-1.2/src/core/nginx.c	2012-09-24 18:50:25 UTC (rev 4852)
@@ -836,7 +836,7 @@
         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;