# HG changeset patch # User Igor Sysoev # Date 1277892766 0 # Node ID ec20f1f93aeacdd164bf255a06b5e7f710e341de # Parent b56935e34273129f89b49112c49955af4bc84476 test the second binary geo range base existence diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c --- a/src/http/modules/ngx_http_geo_module.c +++ b/src/http/modules/ngx_http_geo_module.c @@ -1176,6 +1176,14 @@ ngx_http_geo_include_binary_base(ngx_con goto done; } + if (ctx->binary_include) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "second binary geo range base \"%s\" may not be mixed with \"%s\"", + name->data, ctx->include_name.data); + rc = NGX_ERROR; + goto done; + } + if (ngx_fd_info(file.fd, &fi) == NGX_FILE_ERROR) { ngx_conf_log_error(NGX_LOG_CRIT, cf, ngx_errno, ngx_fd_info_n " \"%s\" failed", name->data);