1berry/nginx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Geo: fixed insertion of ranges specified in descending order.

Browse Source
This commit is contained in:
Ruslan Ermilov 2016-08-23 15:59:14 +03:00
parent f927ab882a
commit 20de5f14e5
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -940,9 +940,14 @@ ngx_http_geo_add_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
range->start = (u_short) s; range = a->elts;
range->end = (u_short) e;
range->value = ctx->value; ngx_memmove(&range[1], &range[0],
(a->nelts - 1) * sizeof(ngx_http_geo_range_t));
range[0].start = (u_short) s;
range[0].end = (u_short) e;
range[0].value = ctx->value;
next: next:

11
src/stream/ngx_stream_geo_module.c
View File

@ -890,9 +890,14 @@ ngx_stream_geo_add_range(ngx_conf_t *cf, ngx_stream_geo_conf_ctx_t *ctx,
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
range->start = (u_short) s; range = a->elts;
range->end = (u_short) e;
range->value = ctx->value; ngx_memmove(&range[1], &range[0],
(a->nelts - 1) * sizeof(ngx_stream_geo_range_t));
range[0].start = (u_short) s;
range[0].end = (u_short) e;
range[0].value = ctx->value;
next: next: