From: Igor Sysoev <igor@sysoev.ru>
Date: Fri, 27 Mar 2009 06:34:31 +0000 (+0000)
Subject: fix plain text values using relative path in ngx_http_complex_value(),
X-Git-Tag: release-0.7.45~10
X-Git-Url: http://git.kaiwu.me/sitemap.xml?a=commitdiff_plain;h=22d381e87c47fd75c2e1aec97def385eef6ef954;p=nginx.git

fix plain text values using relative path in ngx_http_complex_value(),
this fixes the auth_basic_user_file bug introduced in r2589
---

diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index 05851ec1d..b640826e7 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -118,11 +118,6 @@ ngx_http_compile_complex_value(ngx_http_compile_complex_value_t *ccv)
         return NGX_ERROR;
     }
 
-    ccv->complex_value->value = *v;
-    ccv->complex_value->flushes = NULL;
-    ccv->complex_value->lengths = NULL;
-    ccv->complex_value->values = NULL;
-
     nv = 0;
     nc = 0;
 
@@ -147,6 +142,11 @@ ngx_http_compile_complex_value(ngx_http_compile_complex_value_t *ccv)
         ccv->root_prefix = 0;
     }
 
+    ccv->complex_value->value = *v;
+    ccv->complex_value->flushes = NULL;
+    ccv->complex_value->lengths = NULL;
+    ccv->complex_value->values = NULL;
+
     if (nv == 0 && nc == 0) {
         return NGX_OK;
     }