# HG changeset patch # User Maxim Dounin # Date 1348513336 0 # Node ID f66d0a6d7fddf9b224b4f440859198cbf4f40666 # Parent 735a05a53dc5e50a71c06d6c9aa316fccdee0735 Merge of r4817: geo: fixed handling of ranges without default set. The bug had appeared in 0.8.43 (r3653). Patch by Weibin Yao. diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c --- a/src/http/modules/ngx_http_geo_module.c +++ b/src/http/modules/ngx_http_geo_module.c @@ -400,15 +400,15 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_c } } + 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);