[nginx] Allowed configuration token to start with a variable.

Roman Arutyunyan arut at nginx.com
Thu Dec 21 13:28:00 UTC 2017


details:   http://hg.nginx.org/nginx/rev/d91a8c4ac6bb
branches:  
changeset: 7177:d91a8c4ac6bb
user:      Roman Arutyunyan <arut at nginx.com>
date:      Thu Dec 21 13:29:40 2017 +0300
description:
Allowed configuration token to start with a variable.

Specifically, it is now allowed to start with a variable expression with braces:
${name}.  The opening curly bracket in such a token was previously considered
the start of a new block.  Variables located anywhere else in a token worked
fine: foo${name}.

diffstat:

 src/core/ngx_conf_file.c |  5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diffs (15 lines):

diff -r 7f28b61c92f0 -r d91a8c4ac6bb src/core/ngx_conf_file.c
--- a/src/core/ngx_conf_file.c	Tue Dec 19 19:00:27 2017 +0300
+++ b/src/core/ngx_conf_file.c	Thu Dec 21 13:29:40 2017 +0300
@@ -709,6 +709,11 @@ ngx_conf_read_token(ngx_conf_t *cf)
                 last_space = 0;
                 continue;
 
+            case '$':
+                variable = 1;
+                last_space = 0;
+                continue;
+
             default:
                 last_space = 0;
             }


More information about the nginx-devel mailing list