diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2016-08-23 15:59:42 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2016-08-23 15:59:42 +0300 |
| commit | 9208875db1d47d7bdc7b7b6583ea3b3b04b33a01 (patch) | |
| tree | 3a7db11ef713eba1e5d8fe241003eedc8438930d /src | |
| parent | 20de5f14e5f7de68576bc20bce5cf53f615f7113 (diff) | |
| download | nginx-9208875db1d47d7bdc7b7b6583ea3b3b04b33a01.tar.gz nginx-9208875db1d47d7bdc7b7b6583ea3b3b04b33a01.tar.bz2 | |
Geo: fixed warnings when removing nonexistent ranges.
geo $geo {
ranges;
10.0.0.0-10.0.0.255 test;
delete 10.0.1.0-10.0.1.255; # should warn
delete 10.0.0.0-10.0.0.255;
delete 10.0.0.0-10.0.0.255; # should warn
}
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_geo_module.c | 10 | ||||
| -rw-r--r-- | src/stream/ngx_stream_geo_module.c | 10 |
2 files changed, 6 insertions, 14 deletions
diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c index 2794548ed..21b4b334f 100644 --- a/src/http/modules/ngx_http_geo_module.c +++ b/src/http/modules/ngx_http_geo_module.c @@ -990,7 +990,7 @@ ngx_http_geo_delete_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx, a = (ngx_array_t *) ctx->high.low[h]; - if (a == NULL) { + if (a == NULL || a->nelts == 0) { warn = 1; goto next; } @@ -1009,13 +1009,9 @@ ngx_http_geo_delete_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx, break; } - if (s != (ngx_uint_t) range[i].start - && e != (ngx_uint_t) range[i].end) - { - continue; + if (i == a->nelts - 1) { + warn = 1; } - - warn = 1; } next: diff --git a/src/stream/ngx_stream_geo_module.c b/src/stream/ngx_stream_geo_module.c index 5e91c46fb..220454631 100644 --- a/src/stream/ngx_stream_geo_module.c +++ b/src/stream/ngx_stream_geo_module.c @@ -940,7 +940,7 @@ ngx_stream_geo_delete_range(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx, a = (ngx_array_t *) ctx->high.low[h]; - if (a == NULL) { + if (a == NULL || a->nelts == 0) { warn = 1; goto next; } @@ -959,13 +959,9 @@ ngx_stream_geo_delete_range(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx, break; } - if (s != (ngx_uint_t) range[i].start - && e != (ngx_uint_t) range[i].end) - { - continue; + if (i == a->nelts - 1) { + warn = 1; } - - warn = 1; } next: |