mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-11 12:22:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Geo: fixed removing a range in certain cases.

Browse Source 
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).
This commit is contained in:
Ruslan Ermilov 2016-08-23 15:59:06 +03:00
parent 36e1c887db
commit f927ab882a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/modules/ngx_http_geo_module.c
View File

@ -966,7 +966,7 @@ ngx_http_geo_delete_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
warn = 0;
for (n = start; n <= end; n += 0x10000) {
for (n = start; n <= end; n = (n + 0x10000) & 0xffff0000) {
h = n >> 16;

2
src/stream/ngx_stream_geo_module.c
View File

@ -916,7 +916,7 @@ ngx_stream_geo_delete_range(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
warn = 0;
for (n = start; n <= end; n += 0x10000) {
for (n = start; n <= end; n = (n + 0x10000) & 0xffff0000) {
h = n >> 16;