nginx: src/http/modules/ngx_http_geo

Geo: fixed the "ranges" without ranges case. The following configuration returned an empty value for $geo: geo $geo { ranges; default default; }

comparison

equal deleted inserted replaced

-:a9d60fafaa85
+:90d8c3400769
 ngx_uint_t             n;
 ngx_http_geo_range_t  *range;
 *v = *ctx->u.high.default_value;
-addr = ngx_http_geo_addr(r, ctx);
+if (ctx->u.high.low) {
+addr = ngx_http_geo_addr(r, ctx);
-range = ctx->u.high.low[addr >> 16];
+range = ctx->u.high.low[addr >> 16];
-if (range) {
-n = addr & 0xffff;
+if (range) {
-do {
+n = addr & 0xffff;
-if (n >= (ngx_uint_t) range->start && n <= (ngx_uint_t) range->end)
+do {
-{
+if (n >= (ngx_uint_t) range->start
-*v = *range->value;
+&& n <= (ngx_uint_t) range->end)
-break;
+{
-}
+*v = *range->value;
-} while ((++range)->value);
+break;
+}
+} while ((++range)->value);
+}
 }
 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
 "http geo: %v", v);
 *cf = save;
 geo->proxies = ctx.proxies;
 geo->proxy_recursive = ctx.proxy_recursive;
-if (ctx.high.low) {
+if (ctx.ranges) {
-if (!ctx.binary_include) {
+if (ctx.high.low && !ctx.binary_include) {
 for (i = 0; i < 0x10000; i++) {
 a = (ngx_array_t *) ctx.high.low[i];
 if (a == NULL || a->nelts == 0) {
 continue;

Mercurial > hg > nginx