From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 7 Jun 2010 10:04:13 +0000 (+0000)
Subject: merge r3457:
X-Git-Tag: release-0.7.66~17
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=54573bdc1f6ff79a9e28db00368f8fc57e958475;p=nginx.git

merge r3457:

fix a geo range if the range includes two or more /16 networks
and does not begin at /16 network boundary
---

diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c
index 0ec8d093b..a184a7ae3 100644
--- a/src/http/modules/ngx_http_geo_module.c
+++ b/src/http/modules/ngx_http_geo_module.c
@@ -589,7 +589,7 @@ ngx_http_geo_add_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
     ngx_array_t           *a;
     ngx_http_geo_range_t  *range;
 
-    for (n = start; n <= end; n += 0x10000) {
+    for (n = start; n <= end; n = (n + 0x10000) & 0xffff0000) {
 
         h = n >> 16;