cvs: php-src(PHP_4_3) /ext/standard file.c /ext/standard/tests/file fgetcsv.phpt

From: Date: Fri, 02 Apr 2004 16:54:45 +0000
Subject: cvs: php-src(PHP_4_3) /ext/standard file.c /ext/standard/tests/file fgetcsv.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-26930@lists.php.net to get a copy of this message
iliaa Fri Apr 2 11:54:45 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/standard file.c /php-src/ext/standard/tests/file fgetcsv.phpt Log: Fixed bug #27730. http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.279.2.58&r2=1.279.2.59&ty=u Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.279.2.58 php-src/ext/standard/file.c:1.279.2.59 --- php-src/ext/standard/file.c:1.279.2.58 Fri Mar 26 15:53:09 2004 +++ php-src/ext/standard/file.c Fri Apr 2 11:54:44 2004 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.279.2.58 2004/03/26 20:53:09 abies Exp $ */ +/* $Id: file.c,v 1.279.2.59 2004/04/02 16:54:44 iliaa Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -2331,6 +2331,11 @@ } \ } + if (!(e - s)) { + CSV_ADD_ENTRY(s, e, s); + goto done; + } + csv_start: if (!enclosure || !(p = _php_fgetcsv_find_enclosure(s, (e - s), enclosure, 0))) { no_enclosure: http://cvs.php.net/diff.php/php-src/ext/standard/tests/file/fgetcsv.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u Index: php-src/ext/standard/tests/file/fgetcsv.phpt diff -u php-src/ext/standard/tests/file/fgetcsv.phpt:1.1.2.2 php-src/ext/standard/tests/file/fgetcsv.phpt:1.1.2.3 --- php-src/ext/standard/tests/file/fgetcsv.phpt:1.1.2.2 Thu Jan 29 09:35:34 2004 +++ php-src/ext/standard/tests/file/fgetcsv.phpt Fri Apr 2 11:54:44 2004 @@ -23,7 +23,8 @@ 'aaa"aaa","bbb"bbb', 'aaa"aaa""",bbb', 'aaa"\\"a","bbb"', - '""' + '""', + '' ); $file = dirname(__FILE__) . 'fgetcsv.csv'; @@ -161,3 +162,7 @@ [0]=> string(0) "" } +array(1) { + [0]=> + string(0) "" +}

« previous php.cvs (#26930) next »