From: Ruslan Ermilov <ru@nginx.com>
Date: Fri, 21 Dec 2012 08:44:39 +0000 (+0000)
Subject: There's no need to normalize address returned by ngx_ptocidr().
X-Git-Tag: release-1.3.10~15
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=a0caa70c98fcda923970c9edcf8caad60cb8e40a;p=nginx.git

There's no need to normalize address returned by ngx_ptocidr().
---

diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c
index 1170cb337..24091bf71 100644
--- a/src/http/modules/ngx_http_geo_module.c
+++ b/src/http/modules/ngx_http_geo_module.c
@@ -998,7 +998,7 @@ ngx_http_geo_cidr(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
         /* rc == NGX_BUSY */
 
         old = (ngx_http_variable_value_t *)
-              ngx_radix32tree_find(ctx->tree, cidr.u.in.addr & cidr.u.in.mask);
+              ngx_radix32tree_find(ctx->tree, cidr.u.in.addr);
 
         ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
                 "duplicate network \"%V\", value: \"%v\", old value: \"%v\"",