Mercurial > hg > nginx

changeset 3790:d8300807c4f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow empty value as "map" parameter
author Igor Sysoev <igor@sysoev.ru>
date Thu, 25 Nov 2010 15:24:29 +0000
parents 19c931be8b98
children 11701c4c0358
files src/http/modules/ngx_http_map_module.c
diffstat 1 files changed, 0 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_map_module.c
+++ b/src/http/modules/ngx_http_map_module.c
@@ -122,11 +122,6 @@ ngx_http_map_variable(ngx_http_request_t
         len--;
     }
 
-    if (len == 0) {
-        *v = *map->default_value;
-        return NGX_OK;
-    }
-
     key = ngx_hash_strlow(val.data, val.data, len);
 
     value = ngx_hash_find_combined(&map->hash, key, val.data, len);
@@ -357,11 +352,6 @@ ngx_http_map(ngx_conf_t *cf, ngx_command
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "invalid number of the map parameters");
         return NGX_CONF_ERROR;
-
-    } else if (value[0].len == 0) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "invalid first parameter");
-        return NGX_CONF_ERROR;
     }
 
     if (ngx_strcmp(value[0].data, "include") == 0) {