# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1275905053 0
# Node ID 24e7bf1abbe50e7ce93dffd2b33a7e9c7dc12965
# Parent  17995396463d230198c66e7c780aebb4cf86e97a
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
--- 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, n
     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;