Mercurial > hg > nginx
changeset 5227:ea41bba49e8a
Core: strengthen configuration syntax checker.
It is now a syntax error if tokens passed to a custom configuration
handler are terminated by "{".
The following incorrect configuration is now properly rejected:
map $v $v2 {
a b {
c d {
e f {
}
| author | Valentin Bartenev <vbart@nginx.com> |
|---|---|
| date | Thu, 23 May 2013 20:30:27 +0400 |
| parents | a30ea5c6451d |
| children | cbd4bbe976d4 |
| files | src/core/ngx_conf_file.c |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -225,6 +225,11 @@ ngx_conf_parse(ngx_conf_t *cf, ngx_str_t * "types { ... }" directive */ + if (rc == NGX_CONF_BLOCK_START) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "unexpected \"{\""); + goto failed; + } + rv = (*cf->handler)(cf, NULL, cf->handler_conf); if (rv == NGX_CONF_OK) { continue;