diff options
author | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 10:04:13 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 10:04:13 +0000 |
commit | 54573bdc1f6ff79a9e28db00368f8fc57e958475 (patch) | |
tree | d23e488f729759463a8c22389f3be2f25f9cdfc0 | |
parent | 90b8db32242fb32d130c2268c6f26de316a44f25 (diff) | |
download | nginx-54573bdc1f6ff79a9e28db00368f8fc57e958475.tar.gz |
merge r3457:
fix a geo range if the range includes two or more /16 networks
and does not begin at /16 network boundary
-rw-r--r-- | src/http/modules/ngx_http_geo_module.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |