diff options
| author |   robert <robert@openbsd.org> | 2012-05-13 09:14:58 +0000 |
|---|---|---|
| committer | robert <robert@openbsd.org> | 2012-05-13 09:14:58 +0000 |
| commit | 97af15d31a3e788ae1f3063c72204f69e2e38dde (patch) | |
| tree | 40613faa9ab41a3bffd46e7d418c97f022706db8 /usr.sbin/nginx/src/http/modules/ngx_http_geo_module.c | |
| parent | Remove unused and confusing 'head' argument. (diff) | |
| download | wireguard-openbsd-97af15d31a3e788ae1f3063c72204f69e2e38dde.tar.xz wireguard-openbsd-97af15d31a3e788ae1f3063c72204f69e2e38dde.zip | |
update to nginx-1.2.0
Diffstat (limited to 'usr.sbin/nginx/src/http/modules/ngx_http_geo_module.c')
| -rw-r--r-- | usr.sbin/nginx/src/http/modules/ngx_http_geo_module.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/nginx/src/http/modules/ngx_http_geo_module.c b/usr.sbin/nginx/src/http/modules/ngx_http_geo_module.c index 1d7599e5551..30b0e35a9aa 100644 --- a/usr.sbin/nginx/src/http/modules/ngx_http_geo_module.c +++ b/usr.sbin/nginx/src/http/modules/ngx_http_geo_module.c @@ -566,7 +566,7 @@ ngx_http_geo_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx, if (ctx->binary_include) { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, - "binary geo range base \"%s\" may not be mixed with usual entries", + "binary geo range base \"%s\" cannot be mixed with usual entries", ctx->include_name.data); return NGX_CONF_ERROR; } @@ -1195,7 +1195,7 @@ ngx_http_geo_include_binary_base(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx, if (ctx->outside_entries) { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, - "binary geo range base \"%s\" may not be mixed with usual entries", + "binary geo range base \"%s\" cannot be mixed with usual entries", name->data); rc = NGX_ERROR; goto done; @@ -1203,7 +1203,7 @@ ngx_http_geo_include_binary_base(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx, 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\"", + "second binary geo range base \"%s\" cannot be mixed with \"%s\"", name->data, ctx->include_name.data); rc = NGX_ERROR; goto done; |