commit 73fb7e878fac4ba302479e57554f2f688e306361
author Ruslan Ermilov <ru@nginx.com> Thu Dec 06 23:03:53 2012 +0000
committer Ruslan Ermilov <ru@nginx.com> Thu Dec 06 23:03:53 2012 +0000
tree 63e8399b962d4d4aec21bab29fbc5b6c8d4b30c2
parent 8e8201486cb52e929feb16446406253dfbe33e99

Allow the complex value to be defined as an empty string.

This makes conversion from strings to complex values possible
without the loss of functionality.

src/http/ngx_http_script.c

diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index e214519..54d0195 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -114,11 +114,6 @@
 
     v = ccv->value;
 
-    if (v->len == 0) {
-        ngx_conf_log_error(NGX_LOG_EMERG, ccv->cf, 0, "empty parameter");
-        return NGX_ERROR;
-    }
-
     nv = 0;
     nc = 0;
 
@@ -133,8 +128,9 @@
         }
     }
 
-    if (v->data[0] != '$' && (ccv->conf_prefix || ccv->root_prefix)) {
-
+    if ((v->len == 0 || v->data[0] != '$')
+        && (ccv->conf_prefix || ccv->root_prefix))
+    {
         if (ngx_conf_full_name(ccv->cf->cycle, v, ccv->conf_prefix) != NGX_OK) {
             return NGX_ERROR;
         }