[nginx] svn commit: r4856 - in branches/stable-1.2: . src/http/modules

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-09-24 19:02:16 +0000 (Mon, 24 Sep 2012)
New Revision: 4856
URL: http://trac.nginx.org/nginx/changeset/4856/nginx

Log:
Merge of r4817: geo: fixed handling of ranges without default set.

The bug had appeared in 0.8.43 (r3653).  Patch by Weibin Yao.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/http/modules/ngx_http_geo_module.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-09-24 19:00:02 UTC (rev 4855)
+++ branches/stable-1.2	2012-09-24 19:02:16 UTC (rev 4856)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4816,4818-4820,4822-4824,4830-4832,4834,4840,4842-4844
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4830-4832,4834,4840,4842-4844
\ No newline at end of property
Modified: branches/stable-1.2/src/http/modules/ngx_http_geo_module.c
===================================================================
--- branches/stable-1.2/src/http/modules/ngx_http_geo_module.c	2012-09-24 19:00:02 UTC (rev 4855)
+++ branches/stable-1.2/src/http/modules/ngx_http_geo_module.c	2012-09-24 19:02:16 UTC (rev 4856)
@@ -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);