Mercurial > hg > nginx

changeset 3655:ec20f1f93aea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test the second binary geo range base existence
author Igor Sysoev <igor@sysoev.ru>
date Wed, 30 Jun 2010 10:12:46 +0000
parents b56935e34273
children 3d61601f3171
files src/http/modules/ngx_http_geo_module.c
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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);