diff options
| author | Andi Gutmans <andi@php.net> | 2001-05-02 21:52:30 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2001-05-02 21:52:30 +0000 |
| commit | 5aec595716cba2fb9e85cccc8e415f654fc829ab (patch) | |
| tree | b3e4335cb1a462167090f2c4b25a63b96b33454c /Zend/zend_ini_scanner.l | |
| parent | 7361fa13fca5a7312e7afb2ba97ea4bdc7a310c2 (diff) | |
| download | php-git-5aec595716cba2fb9e85cccc8e415f654fc829ab.tar.gz | |
- Support \r as newline in the ini scanner
Diffstat (limited to 'Zend/zend_ini_scanner.l')
| -rw-r--r-- | Zend/zend_ini_scanner.l | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l index 0c5e43e8b1..d78a146dfe 100644 --- a/Zend/zend_ini_scanner.l +++ b/Zend/zend_ini_scanner.l @@ -162,6 +162,8 @@ void zend_ini_close_file(zend_file_handle *fh) %} +NEWLINE ("\r"|"\n"|"\r\n") + %option noyywrap %option yylineno @@ -183,7 +185,7 @@ void zend_ini_close_file(zend_file_handle *fh) return CFG_FALSE; } -<INITIAL>[[][^[]+[\]]([\n]?|"\r\n"?) { +<INITIAL>[[][^[]+[\]]{NEWLINE}? { /* SECTION */ /* eat trailng ] */ @@ -261,11 +263,11 @@ void zend_ini_close_file(zend_file_handle *fh) return yytext[0]; } -<INITIAL>"\r\n" { +<INITIAL>{NEWLINE} { return '\n'; } -<INITIAL>[;][^\r\n]*[\r\n]? { +<INITIAL>[;][^\r\n]*{NEWLINE}? { /* comment */ return '\n'; } |