# HG changeset patch # User Igor Sysoev # Date 1238135671 0 # Node ID 2f4a3a4dfd3483f0284892223e313503e5d5c614 # Parent cb96a60c8f10068f95fb117cb602da61ce3417b5 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 --- 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_ 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_ 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; }