iliaa Mon Jan 17 19:14:56 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/standard file.c
Log:
Fixed bug #31580 (fgetcsv() problematic with "" escape sequences).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.803&r2=1.1247.2.804&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.803 php-src/NEWS:1.1247.2.804
--- php-src/NEWS:1.1247.2.803 Mon Jan 17 12:22:21 2005
+++ php-src/NEWS Mon Jan 17 19:14:55 2005
@@ -3,6 +3,7 @@
?? ??? ????, Version 4.3.11
- Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
+- Fixed bug #31580 (fgetcsv() problematic with "" escape sequences). (Ilia)
- Fixed bug #31454 (session_set_save_handler crashes PHP when supplied
non-existent object ref). (Tony)
- Fixed bug #31444 (Memory leak in zend_language_scanner.c).
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.279.2.67&r2=1.279.2.68&ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.279.2.67
php-src/ext/standard/file.c:1.279.2.68
--- php-src/ext/standard/file.c:1.279.2.67 Wed Dec 8 16:15:02 2004
+++ php-src/ext/standard/file.c Mon Jan 17 19:14:56 2005
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.279.2.67 2004/12/08 21:15:02 iliaa Exp $ */
+/* $Id: file.c,v 1.279.2.68 2005/01/18 00:14:56 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2427,9 +2427,6 @@
if ((p = memchr(p2, delimiter, (e - p2)))) {
p2 = s;
s = p + 1;
- if (*p2 == enclosure) {
- p2++;
- }
/* copy data to buffer */
buf2 = erealloc(buf2, buf2_len + (p - p2) + 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php