cvs: php-src(PHP_5_2) / NEWS /ext/standard file.c
| From: | Jani Taskinen | Date: | Sun, 01 Jul 2007 21:28:17 +0000 |
| Subject: | cvs: php-src(PHP_5_2) / NEWS /ext/standard file.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-45065@lists.php.net to get a copy of this message | ||
sniper Sun Jul 1 21:28:17 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/standard file.c
Log:
MFH: - Fixed bug #41865 (fputcsv(): 2nd parameter is not optional)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.807&r2=1.2027.2.547.2.808&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.807 php-src/NEWS:1.2027.2.547.2.808
--- php-src/NEWS:1.2027.2.547.2.807 Thu Jun 28 03:13:29 2007
+++ php-src/NEWS Sun Jul 1 21:28:16 2007
@@ -39,6 +39,7 @@
- Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory
already exists). (Pierre)
+- Fixed bug #41865 (fputcsv(): 2nd parameter is not optional). (Jani)
- Fixed bug #41813 (segmentation fault when using string offset as an object).
(judas dot iscariote at gmail dot com, Tony)
- Fixed bug #41795 (checkdnsrr does not support DNS_TXT type).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.20&r2=1.409.2.6.2.21&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.20 php-src/ext/standard/file.c:1.409.2.6.2.21
--- php-src/ext/standard/file.c:1.409.2.6.2.20 Sun May 27 17:33:39 2007
+++ php-src/ext/standard/file.c Sun Jul 1 21:28:16 2007
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.409.2.6.2.20 2007/05/27 17:33:39 iliaa Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.21 2007/07/01 21:28:16 sniper Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1914,7 +1914,7 @@
int count, i = 0;
smart_str csvline = {0};
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|ass",
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ra|ss",
&fp, &fields, &delimiter_str, &delimiter_str_len,
&enclosure_str, &enclosure_str_len) == FAILURE) {
return;