diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-06-30 10:12:46 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-06-30 10:12:46 +0000 |
| commit | 3b0ddc2097b9680c95639587922929c1c0142c24 (patch) | |
| tree | 9a650ff006772399883296a03f8339908c3c2b0b /src | |
| parent | e3d88fb8ebfa34e3fd9ab0c32117a2ade523e9f9 (diff) | |
| download | nginx-3b0ddc2097b9680c95639587922929c1c0142c24.tar.gz nginx-3b0ddc2097b9680c95639587922929c1c0142c24.zip | |
test the second binary geo range base existence
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_geo_module.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c index efa69b3a5..0b511359c 100644 --- 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_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx, 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); |