diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-03-27 06:34:31 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-03-27 06:34:31 +0000 |
| commit | 22d381e87c47fd75c2e1aec97def385eef6ef954 (patch) | |
| tree | af4cb423bd11f0aa277f3e30848e3e913828f7e5 /src/http/ngx_http_script.c | |
| parent | 1e5ef6b0f4c6c2b962168f92c7c853006d7a2132 (diff) | |
| download | nginx-22d381e87c47fd75c2e1aec97def385eef6ef954.tar.gz nginx-22d381e87c47fd75c2e1aec97def385eef6ef954.zip | |
fix plain text values using relative path in ngx_http_complex_value(),
this fixes the auth_basic_user_file bug introduced in r2589
Diffstat (limited to 'src/http/ngx_http_script.c')
| -rw-r--r-- | src/http/ngx_http_script.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; } |