diff options
| author | Scott MacVicar <scottmac@php.net> | 2008-04-07 11:39:14 +0000 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2008-04-07 11:39:14 +0000 |
| commit | 878230cfbb2297b32985ad594a2d56130ba448d2 (patch) | |
| tree | 4983c7924b5522b34053f2dffab15d7087da6220 /Zend/zend_ini_scanner.l | |
| parent | a1e094514303fb953685ceda8acc794475994706 (diff) | |
| download | php-git-878230cfbb2297b32985ad594a2d56130ba448d2.tar.gz | |
Fixed bug #44609 (Dollar in ini variables are not parsed correctly)
Diffstat (limited to 'Zend/zend_ini_scanner.l')
| -rw-r--r-- | Zend/zend_ini_scanner.l | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l index b30b24f83a..1ea2d8f1cb 100644 --- a/Zend/zend_ini_scanner.l +++ b/Zend/zend_ini_scanner.l @@ -319,7 +319,7 @@ SECTION_RAW_CHARS [^\]\n\r] SINGLE_QUOTED_CHARS [^'] RAW_VALUE_CHARS [^=\n\r;] -LITERAL_DOLLAR ("$"([^a-zA-Z0-9{\000]|("\\"{ANY_CHAR}))) +LITERAL_DOLLAR ("$"([^{\000]|("\\"{ANY_CHAR}))) VALUE_CHARS ([^$= \t\n\r;&|~()!"'\000]|{LITERAL_DOLLAR}) SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR}) DOUBLE_QUOTES_CHARS ([^$"\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR}) @@ -488,7 +488,7 @@ DOUBLE_QUOTES_CHARS ([^$"\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR}) <ST_VALUE,ST_RAW>[^] { /* End of option value (if EOF is reached before EOL */ BEGIN(INITIAL); - return 0; + return END_OF_LINE; } <*>[^] { |