commit 22d381e87c47fd75c2e1aec97def385eef6ef954
author Igor Sysoev <igor@sysoev.ru> Fri Mar 27 06:34:31 2009 +0000
committer Igor Sysoev <igor@sysoev.ru> Fri Mar 27 06:34:31 2009 +0000
tree af4cb423bd11f0aa277f3e30848e3e913828f7e5
parent 1e5ef6b0f4c6c2b962168f92c7c853006d7a2132

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

src/http/ngx_http_script.c

diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index 05851ec..b640826 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -118,11 +118,6 @@
         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 @@
         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;
     }