[nginx] svn commit: r4981 - trunk/src/http/modules

[ru at nginx.com]

Author: ru
Date: 2012-12-21 08:46:52 +0000 (Fri, 21 Dec 2012)
New Revision: 4981
URL: http://trac.nginx.org/nginx/changeset/4981/nginx

Log:
Geo: ensure that default entry is always present.

If 0.0.0.0/32 entry was present and there was no explicit "default",
we failed to add an empty string as a default value.


Modified:
   trunk/src/http/modules/ngx_http_geo_module.c

Modified: trunk/src/http/modules/ngx_http_geo_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_geo_module.c	2012-12-21 08:44:39 UTC (rev 4980)
+++ trunk/src/http/modules/ngx_http_geo_module.c	2012-12-21 08:46:52 UTC (rev 4981)
@@ -453,16 +453,14 @@
         ngx_destroy_pool(ctx.temp_pool);
         ngx_destroy_pool(pool);
 
-        if (ngx_radix32tree_find(ctx.tree, 0) != NGX_RADIX_NO_VALUE) {
-            return rv;
-        }
-
         if (ngx_radix32tree_insert(ctx.tree, 0, 0,
                                    (uintptr_t) &ngx_http_variable_null_value)
             == NGX_ERROR)
         {
             return NGX_CONF_ERROR;
         }
+
+        /* NGX_BUSY is okay (default was set explicitly) */
     }
 
     return rv;