Mercurial > hg > nginx
comparison src/http/modules/ngx_http_geo_module.c @ 4593:834049edae24
Fixed grammar in error messages.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Thu, 12 Apr 2012 19:35:41 +0000 |
parents | d620f497c50f |
children | d0db70f4c13b |
comparison
equal
deleted
inserted
replaced
4592:ab1649495d30 | 4593:834049edae24 |
---|---|
564 return NGX_CONF_OK; | 564 return NGX_CONF_OK; |
565 } | 565 } |
566 | 566 |
567 if (ctx->binary_include) { | 567 if (ctx->binary_include) { |
568 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 568 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
569 "binary geo range base \"%s\" may not be mixed with usual entries", | 569 "binary geo range base \"%s\" cannot be mixed with usual entries", |
570 ctx->include_name.data); | 570 ctx->include_name.data); |
571 return NGX_CONF_ERROR; | 571 return NGX_CONF_ERROR; |
572 } | 572 } |
573 | 573 |
574 if (ctx->high.low == NULL) { | 574 if (ctx->high.low == NULL) { |
1193 return NGX_DECLINED; | 1193 return NGX_DECLINED; |
1194 } | 1194 } |
1195 | 1195 |
1196 if (ctx->outside_entries) { | 1196 if (ctx->outside_entries) { |
1197 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 1197 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
1198 "binary geo range base \"%s\" may not be mixed with usual entries", | 1198 "binary geo range base \"%s\" cannot be mixed with usual entries", |
1199 name->data); | 1199 name->data); |
1200 rc = NGX_ERROR; | 1200 rc = NGX_ERROR; |
1201 goto done; | 1201 goto done; |
1202 } | 1202 } |
1203 | 1203 |
1204 if (ctx->binary_include) { | 1204 if (ctx->binary_include) { |
1205 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 1205 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
1206 "second binary geo range base \"%s\" may not be mixed with \"%s\"", | 1206 "second binary geo range base \"%s\" cannot be mixed with \"%s\"", |
1207 name->data, ctx->include_name.data); | 1207 name->data, ctx->include_name.data); |
1208 rc = NGX_ERROR; | 1208 rc = NGX_ERROR; |
1209 goto done; | 1209 goto done; |
1210 } | 1210 } |
1211 | 1211 |