Merge of r4817: geo: fixed handling of ranges without default set.
The bug had appeared in 0.8.43 (r3653). Patch by Weibin Yao.
This commit is contained in:
parent
8cc4f6248a
commit
2b64e62233
|
@ -400,15 +400,15 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
|||
}
|
||||
}
|
||||
|
||||
if (ctx.high.default_value == NULL) {
|
||||
ctx.high.default_value = &ngx_http_variable_null_value;
|
||||
}
|
||||
|
||||
geo->u.high = ctx.high;
|
||||
|
||||
var->get_handler = ngx_http_geo_range_variable;
|
||||
var->data = (uintptr_t) geo;
|
||||
|
||||
if (ctx.high.default_value == NULL) {
|
||||
ctx.high.default_value = &ngx_http_variable_null_value;
|
||||
}
|
||||
|
||||
ngx_destroy_pool(ctx.temp_pool);
|
||||
ngx_destroy_pool(pool);
|
||||
|
||||
|
|
Loading…
Reference in New Issue