cvs: php-src(PHP_5_3) / NEWS /ext/standard/tests/file bug46347.phpt ZendEngine2 zend_ini_scanner.l

nlopess Mon Feb 2 19:23:13 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/file bug46347.phpt Modified files: /php-src NEWS /ZendEngine2 zend_ini_scanner.l Log: fix bug #46347: allow * in ini keys http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.480&r2=1.2027.2.547.2.965.2.481&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.480 php-src/NEWS:1.2027.2.547.2.965.2.481 --- php-src/NEWS:1.2027.2.547.2.965.2.480 Wed Jan 28 22:43:50 2009 +++ php-src/NEWS Mon Feb 2 19:23:12 2009 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2009, PHP 5.3.0 Beta 2 - Fixed bug #47229 (preg_quote() should escape the '-' char). (Nuno) +- Fixed bug #46347 (parse_ini_file() doesn't support * in keys). (Nuno) 29 Jan 2009, PHP 5.3.0 Beta 1 http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner.l?r1=1.41.2.2.2.2.2.15&r2=1.41.2.2.2.2.2.16&diff_format=u Index: ZendEngine2/zend_ini_scanner.l diff -u ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.15 ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.16 --- ZendEngine2/zend_ini_scanner.l:1.41.2.2.2.2.2.15 Fri Jan 2 20:45:41 2009 +++ ZendEngine2/zend_ini_scanner.l Mon Feb 2 19:23:13 2009 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_ini_scanner.l,v 1.41.2.2.2.2.2.15 2009/01/02 20:45:41 felipe Exp $ */ +/* $Id: zend_ini_scanner.l,v 1.41.2.2.2.2.2.16 2009/02/02 19:23:13 nlopess Exp $ */ #include <errno.h> #include "zend.h" @@ -308,7 +308,7 @@ TABS_AND_SPACES [ \t] WHITESPACE [ \t]+ CONSTANT [a-zA-Z][a-zA-Z0-9_]* -LABEL [a-zA-Z0-9_][a-zA-Z0-9._-]* +LABEL [a-zA-Z0-9_][a-zA-Z0-9*._-]* TOKENS [:,.\[\]"'()|^&+-/*=%$!~<>?@{}] OPERATORS [&|~()!] DOLLAR_CURLY "${" http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug46347.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/bug46347.phpt +++ php-src/ext/standard/tests/file/bug46347.phpt