commit 404109b79c93a4212aedab7a31659a0dd0c4749f
author Ruslan Ermilov <ru@nginx.com> Tue Aug 23 15:59:14 2016 +0300
committer Ruslan Ermilov <ru@nginx.com> Tue Aug 23 15:59:14 2016 +0300
tree 2ef74ab0e3bb833acb0bded8cae8a47ad03d9b45
parent 22a20b45f3f83ce67c2754aab5066c4eb0f48c70

Geo: fixed insertion of ranges specified in descending order.

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 e643804..2794548 100644
--- a/src/http/modules/ngx_http_geo_module.c
+++ b/src/http/modules/ngx_http_geo_module.c
@@ -940,9 +940,14 @@
             return NGX_CONF_ERROR;
         }
 
-        range->start = (u_short) s;
-        range->end = (u_short) e;
-        range->value = ctx->value;
+        range = a->elts;
+
+        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:
 

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 1ee0154..5e91c46 100644
--- a/src/stream/ngx_stream_geo_module.c
+++ b/src/stream/ngx_stream_geo_module.c
@@ -890,9 +890,14 @@
             return NGX_CONF_ERROR;
         }
 
-        range->start = (u_short) s;
-        range->end = (u_short) e;
-        range->value = ctx->value;
+        range = a->elts;
+
+        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: