commit 22a20b45f3f83ce67c2754aab5066c4eb0f48c70
author Ruslan Ermilov <ru@nginx.com> Tue Aug 23 15:59:06 2016 +0300
committer Ruslan Ermilov <ru@nginx.com> Tue Aug 23 15:59:06 2016 +0300
tree 9a80b7c1fd718ded5daf7246232840584f0142b5
parent e4b064c00e475df28b99775e3680290173f4bcc0

Geo: fixed removing a range in certain cases.

If the range includes two or more /16 networks and does
not start at the /16 boundary, the last subrange was not
removed (see 91cff7f97a50 for details).

src/http/modules/ngx_http_geo_module.c

diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c
index af061af..e643804 100644
--- a/src/http/modules/ngx_http_geo_module.c
+++ b/src/http/modules/ngx_http_geo_module.c
@@ -966,7 +966,7 @@
 
     warn = 0;
 
-    for (n = start; n <= end; n += 0x10000) {
+    for (n = start; n <= end; n = (n + 0x10000) & 0xffff0000) {
 
         h = n >> 16;
 

src/stream/ngx_stream_geo_module.c

diff --git a/src/stream/ngx_stream_geo_module.c b/src/stream/ngx_stream_geo_module.c
index 3bdeff7..1ee0154 100644
--- a/src/stream/ngx_stream_geo_module.c
+++ b/src/stream/ngx_stream_geo_module.c
@@ -916,7 +916,7 @@
 
     warn = 0;
 
-    for (n = start; n <= end; n += 0x10000) {
+    for (n = start; n <= end; n = (n + 0x10000) & 0xffff0000) {
 
         h = n >> 16;