archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Fixed bug #52508 (newline problem with parse_ini_file+INI_SCANNER_RAW)

Browse source
This commit is contained in:
Felipe Pena 2010-08-01 15:26:54 +00:00
parent c0e6f37cb9
commit 3ef14fc609
5 changed files with 1497 additions and 1467 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -1,6 +1,8 @@
PHP NEWS PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2010, PHP 5.3.4 ?? ??? 2010, PHP 5.3.4
- Fixed bug #52508 (newline problem with parse_ini_file+INI_SCANNER_RAW).
(Felipe)
- Fixed bug #52487 (PDO::FETCH_INTO leaks memory). (Felipe) - Fixed bug #52487 (PDO::FETCH_INTO leaks memory). (Felipe)
- Fixed bug #52484 (__set() ignores setting properties with empty names). - Fixed bug #52484 (__set() ignores setting properties with empty names).
(Felipe) (Felipe)

20
Zend/tests/bug52508.phpt Normal file
View file

@ -0,0 +1,20 @@
--TEST--
Bug #52508 (newline problem with parse_ini_file+INI_SCANNER_RAW)
--FILE--
<?php
$file = dirname(__FILE__) .'/bug52508.ini';
file_put_contents($file, "a = 1");
$ini_array = parse_ini_file($file, true, INI_SCANNER_RAW);
var_dump($ini_array);
unlink($file);
?>
--EXPECT--
array(1) {
["a"]=>
string(1) "1"
}

2936
Zend/zend_ini_scanner.c
View file

File diff suppressed because it is too large Load diff

2
Zend/zend_ini_scanner.l
View file

@ -344,7 +344,7 @@ DOLLAR_CURLY "${"
SECTION_RAW_CHARS [^\]\n\r] SECTION_RAW_CHARS [^\]\n\r]
SINGLE_QUOTED_CHARS [^'] SINGLE_QUOTED_CHARS [^']
RAW_VALUE_CHARS [^\n\r;] RAW_VALUE_CHARS [^\n\r;\000]
LITERAL_DOLLAR ("$"([^{\000]|("\\"{ANY_CHAR}))) LITERAL_DOLLAR ("$"([^{\000]|("\\"{ANY_CHAR})))
VALUE_CHARS ([^$= \t\n\r;&|~()!"'\000]|{LITERAL_DOLLAR}) VALUE_CHARS ([^$= \t\n\r;&|~()!"'\000]|{LITERAL_DOLLAR})

2
Zend/zend_ini_scanner_defs.h
View file

@ -1,4 +1,4 @@
/* Generated by re2c 0.13.5 on Tue May 25 22:53:58 2010 */ /* Generated by re2c 0.13.5 on Sun Aug 1 12:07:43 2010 */
#line 3 "Zend/zend_ini_scanner_defs.h" #line 3 "Zend/zend_ini_scanner_defs.h"
enum YYCONDTYPE { enum YYCONDTYPE {