jani Sun, 07 Feb 2010 11:40:29 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=294695
Log: - Fixed bug #50952 (allow underscore _ in constants parsed in php.ini files) Bug: http://bugs.php.net/50952 (Open) parse_ini_file() not parsing constants Changed paths: U php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.l U php/php-src/trunk/Zend/zend_ini_scanner.l Modified: php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.l =================================================================== --- php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.l 2010-02-06 23:59:23 UTC (rev 294694) +++ php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.l 2010-02-07 11:40:29 UTC (rev 294695) @@ -336,7 +336,7 @@ NEWLINE ("\r"|"\n"|"\r\n") TABS_AND_SPACES [ \t] WHITESPACE [ \t]+ -CONSTANT [a-zA-Z][a-zA-Z0-9_]* +CONSTANT [a-zA-Z_][a-zA-Z0-9_]* LABEL [^=\n\r\t;|&$~(){}!"\[]+ TOKENS [:,.\[\]"'()|^&+-/*=%$!~<>?...@{}] OPERATORS [&|~()!] Modified: php/php-src/trunk/Zend/zend_ini_scanner.l =================================================================== --- php/php-src/trunk/Zend/zend_ini_scanner.l 2010-02-06 23:59:23 UTC (rev 294694) +++ php/php-src/trunk/Zend/zend_ini_scanner.l 2010-02-07 11:40:29 UTC (rev 294695) @@ -336,7 +336,7 @@ NEWLINE ("\r"|"\n"|"\r\n") TABS_AND_SPACES [ \t] WHITESPACE [ \t]+ -CONSTANT [a-zA-Z][a-zA-Z0-9_]* +CONSTANT [a-zA-Z_][a-zA-Z0-9_]* LABEL [^=\n\r\t;|&$~(){}!"\[]+ TOKENS [:,.\[\]"'()|^&+-/*=%$!~<>?...@{}] OPERATORS [&|~()!]
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
