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

ru at nginx.com ru at nginx.com
Fri Dec 21 08:44:40 UTC 2012


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

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


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-20 19:04:28 UTC (rev 4979)
+++ trunk/src/http/modules/ngx_http_geo_module.c	2012-12-21 08:44:39 UTC (rev 4980)
@@ -998,7 +998,7 @@
         /* 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\"",



More information about the nginx-devel mailing list