Fixed bug #37002 (Have to quote literals in INI when concatenating with vars)

diff --git a/NEWS b/NEWS
index de969bd7cc33594b1172339127433f238fac9b22..b3be54834af09b7a92507335d5c84af432497b48 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? Apr 2006, PHP 5.1.3
+- Fixed bug #37002 (Have to quote literals in INI when concatenating with
+  vars). (Dmitry) 
+
 06 Apr 2006, PHP 5.1.3RC3
 - Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry)
 - Changed SOAP extension to cache WSDL structure in memory and thus speed up

diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y
index 8c1976ac887dc405721d68426840d3fa91d79aff..244673dba6de037ae922ac594a0632349833cb41 100644 (file)
--- a/Zend/zend_ini_parser.y
+++ b/Zend/zend_ini_parser.y
@@ -249,25 +249,26 @@ string_or_value:
                expr { $$ = $1; }
        |       CFG_TRUE { $$ = $1; }
        |       CFG_FALSE { $$ = $1; }
-       |   var_string_list { $$ = $1; }
        |       '\n' { zend_ini_init_string(&$$); }
        |       /* empty */ { zend_ini_init_string(&$$); }
 ;
 
 
 var_string_list:
-               var_string_list cfg_var_ref { zend_ini_add_string(&$$, &$1, &$2); free($2.value.str.val); }
+               cfg_var_ref { $$ = $1; }
+       |       TC_ENCAPSULATED_STRING { $$ = $1; }
+       |       constant_string { $$ = $1; }
+       |       var_string_list cfg_var_ref { zend_ini_add_string(&$$, &$1, &$2); free($2.value.str.val); }
        |       var_string_list TC_ENCAPSULATED_STRING { zend_ini_add_string(&$$, &$1, &$2); free($2.value.str.val); }
-       |       var_string_list constant_string { zend_ini_add_string(&$$, &$1, &$2); }
-       |       /* empty */ { zend_ini_init_string(&$$); }
+       |       var_string_list constant_string { zend_ini_add_string(&$$, &$1, &$2); free($2.value.str.val); }
 ;
 
 cfg_var_ref:
-               TC_DOLLAR_CURLY TC_STRING '}' { zend_ini_get_var(&$$, &$2); }
+               TC_DOLLAR_CURLY TC_STRING '}' { zend_ini_get_var(&$$, &$2); free($2.value.str.val); }
 ;
 
 expr:
-               constant_string                 { $$ = $1; }
+               var_string_list                 { $$ = $1; }
        |       expr '|' expr                   { zend_ini_do_op('|', &$$, &$1, &$3); }
        |       expr '&' expr                   { zend_ini_do_op('&', &$$, &$1, &$3); }
        |       '~' expr                                { zend_ini_do_op('~', &$$, &$2, NULL); }