Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_geo_module.c @ 672:f41d4b305d22 NGINX_1_2_0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.2.0 *) Bugfix: a segmentation fault might occur in a worker process if the "try_files" directive was used; the bug had appeared in 1.1.19. *) Bugfix: response might be truncated if there were more than IOV_MAX buffers used. *) Bugfix: in the "crop" parameter of the "image_filter" directive. Thanks to Maxim Bublis.
author Igor Sysoev <http://sysoev.ru>
date Mon, 23 Apr 2012 00:00:00 +0400
parents d0f7a625f27c
children 4dcaf40cc702
comparison
equal deleted inserted replaced
671:47cb3497fbab 672:f41d4b305d22
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