Mercurial > hg > nginx-vendor-current
comparison src/core/ngx_conf_file.c @ 672:f41d4b305d22 NGINX_1_2_0
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 | e5fa0a4a7d27 |
children | 5cb5db9975ba |
comparison
equal
deleted
inserted
replaced
671:47cb3497fbab | 672:f41d4b305d22 |
---|---|
463 | 463 |
464 if (b->pos >= b->last) { | 464 if (b->pos >= b->last) { |
465 | 465 |
466 if (cf->conf_file->file.offset >= file_size) { | 466 if (cf->conf_file->file.offset >= file_size) { |
467 | 467 |
468 if (cf->args->nelts > 0) { | 468 if (cf->args->nelts > 0 || !last_space) { |
469 | 469 |
470 if (cf->conf_file->file.fd == NGX_INVALID_FILE) { | 470 if (cf->conf_file->file.fd == NGX_INVALID_FILE) { |
471 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 471 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
472 "unexpected end of parameter, " | 472 "unexpected end of parameter, " |
473 "expecting \";\""); | 473 "expecting \";\""); |
1479 if (*np >= bounds->low) { | 1479 if (*np >= bounds->low) { |
1480 return NGX_CONF_OK; | 1480 return NGX_CONF_OK; |
1481 } | 1481 } |
1482 | 1482 |
1483 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 1483 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
1484 "value must be equal or more than %i", bounds->low); | 1484 "value must be equal to or greater than %i", |
1485 bounds->low); | |
1485 | 1486 |
1486 return NGX_CONF_ERROR; | 1487 return NGX_CONF_ERROR; |
1487 } | 1488 } |
1488 | 1489 |
1489 if (*np >= bounds->low && *np <= bounds->high) { | 1490 if (*np >= bounds->low && *np <= bounds->high) { |