Mercurial > hg > nginx
comparison src/http/modules/ngx_http_rewrite_module.c @ 4710:5a4666d4b6cb stable-1.2
Merge of r4636, r4637, r4638: config sanity checks.
*) Added syntax checking of the second parameter of the "split_clients"
directive.
*) Capped the status code that may be returned with "return" and
"try_files".
*) Zero padded the returned and logged HTTP status code, and fixed possible
buffer overrun in $status handling.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Fri, 29 Jun 2012 17:28:41 +0000 |
| parents | 778ef9c3fd2d |
| children | 9f4cdc7a8578 |
comparison
equal
deleted
inserted
replaced
| 4708:668de9844a02 | 4710:5a4666d4b6cb |
|---|---|
| 483 return NGX_CONF_ERROR; | 483 return NGX_CONF_ERROR; |
| 484 } | 484 } |
| 485 | 485 |
| 486 } else { | 486 } else { |
| 487 | 487 |
| 488 if (ret->status > 999) { | |
| 489 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 490 "invalid return code \"%V\"", &value[1]); | |
| 491 return NGX_CONF_ERROR; | |
| 492 } | |
| 493 | |
| 488 if (cf->args->nelts == 2) { | 494 if (cf->args->nelts == 2) { |
| 489 return NGX_CONF_OK; | 495 return NGX_CONF_OK; |
| 490 } | 496 } |
| 491 | 497 |
| 492 v = &value[2]; | 498 v = &value[2]; |