diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2012-12-21 08:46:52 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2012-12-21 08:46:52 +0000 |
| commit | f1819242fcf83ef79808a552d83ffec51713856d (patch) | |
| tree | 4c641ce6120a295d155fa704ec61106c18c92e43 | |
| parent | a0caa70c98fcda923970c9edcf8caad60cb8e40a (diff) | |
| download | nginx-f1819242fcf83ef79808a552d83ffec51713856d.tar.gz nginx-f1819242fcf83ef79808a552d83ffec51713856d.tar.bz2 | |
Geo: ensure that default entry is always present.
If 0.0.0.0/32 entry was present and there was no explicit "default",
we failed to add an empty string as a default value.
| -rw-r--r-- | src/http/modules/ngx_http_geo_module.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c index 24091bf71..26f4e577a 100644 --- a/src/http/modules/ngx_http_geo_module.c +++ b/src/http/modules/ngx_http_geo_module.c @@ -453,16 +453,14 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ngx_destroy_pool(ctx.temp_pool); ngx_destroy_pool(pool); - if (ngx_radix32tree_find(ctx.tree, 0) != NGX_RADIX_NO_VALUE) { - return rv; - } - if (ngx_radix32tree_insert(ctx.tree, 0, 0, (uintptr_t) &ngx_http_variable_null_value) == NGX_ERROR) { return NGX_CONF_ERROR; } + + /* NGX_BUSY is okay (default was set explicitly) */ } return rv; |