IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

allow empty value as "map" parameter

Browse Source
This commit is contained in:
Igor Sysoev 2010-11-25 15:24:29 +00:00
parent 67e6bafc90
commit 04e145d2da
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/http/modules/ngx_http_map_module.c
View File

@ -122,11 +122,6 @@ ngx_http_map_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
len--; len--;
} }
if (len == 0) {
*v = *map->default_value;
return NGX_OK;
}
key = ngx_hash_strlow(val.data, val.data, len); key = ngx_hash_strlow(val.data, val.data, len);
value = ngx_hash_find_combined(&map->hash, key, 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_t *dummy, void *conf)
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid number of the map parameters"); "invalid number of the map parameters");
return NGX_CONF_ERROR; 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) { if (ngx_strcmp(value[0].data, "include") == 0) {