From: Valentin Bartenev <vbart@nginx.com>
Date: Thu, 23 May 2013 16:30:27 +0000 (+0400)
Subject: Core: strengthen configuration syntax checker.
X-Git-Tag: release-1.5.1~10
X-Git-Url: http://git.kaiwu.me/%7B@url%7D?a=commitdiff_plain;h=c8702948dbe97866bb6f4fadf8773f5fd5a3d374;p=nginx.git

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 {
  }
---

diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index a26267213..0d12ec2cd 100644
--- 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 *filename)
              * "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;