mirror of
https://github.com/nginx/nginx.git
synced 2024-12-19 05:33:52 -06:00
allow empty value as "map" parameter
This commit is contained in:
parent
67e6bafc90
commit
04e145d2da
@ -122,11 +122,6 @@ ngx_http_map_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
|
||||
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_t *dummy, void *conf)
|
||||
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) {
|
||||
|
Loading…
Reference in New Issue
Block a user