Mercurial > hg > nginx
changeset 4855:f66d0a6d7fdd stable-1.2
Merge of r4817: geo: fixed handling of ranges without default set.
The bug had appeared in 0.8.43 (r3653). Patch by Weibin Yao.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 24 Sep 2012 19:02:16 +0000 |
parents | 735a05a53dc5 |
children | 43b7b9572fe1 |
files | src/http/modules/ngx_http_geo_module.c |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_geo_module.c Mon Sep 24 19:00:02 2012 +0000 +++ b/src/http/modules/ngx_http_geo_module.c Mon Sep 24 19:02:16 2012 +0000 @@ -400,15 +400,15 @@ } } + 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);