From: Roman Arutyunyan Date: Thu, 21 Dec 2017 10:29:40 +0000 (+0300) Subject: Allowed configuration token to start with a variable. X-Git-Tag: release-1.13.8~5 X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=0ad556fe59ad132dc4d34dea9e80f2ff2c3c1314;p=nginx.git 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}. --- diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c index fb28a5a94..ba454dea8 100644 --- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -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; }