tony2001 Sun Feb 5 19:23:30 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/spl spl_directory.c
Log:
MFH: fix #36295 (typo in SplFileObject::flock() parameter name)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.400&r2=1.2027.2.401&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.400 php-src/NEWS:1.2027.2.401
--- php-src/NEWS:1.2027.2.400 Sun Feb 5 15:54:56 2006
+++ php-src/NEWS Sun Feb 5 19:23:29 2006
@@ -20,6 +20,7 @@
- Added imap_savebody() that allows message body to be written to a file.
(Mike)
- Fixed imagecolorallocate() and imagecolorallocatelapha() to return FALSE
on error. (Pierre)
+- Fixed bug #36295 (typo in SplFileObject::flock() parameter name). (Tony)
- Fixed bug #36287 (Segfault with SplFileInfo conversion). (Marcus)
- Fixed bug #36268 (Object destructors called even after fatal errors).
(Dmitry)
- Fixed bug #36258 (SplFileObject::getPath() may lead to segfault). (Tony)
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.18&r2=1.45.2.19&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.18
php-src/ext/spl/spl_directory.c:1.45.2.19
--- php-src/ext/spl/spl_directory.c:1.45.2.18 Sun Feb 5 11:43:44 2006
+++ php-src/ext/spl/spl_directory.c Sun Feb 5 19:23:30 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.c,v 1.45.2.18 2006/02/05 11:43:44 helly Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.19 2006/02/05 19:23:30 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1899,7 +1899,7 @@
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_flock, 0, 0, 1)
ZEND_ARG_INFO(0, operation)
- ZEND_ARG_INFO(1, wouldblock])
+ ZEND_ARG_INFO(1, wouldblock)
ZEND_END_ARG_INFO()
static
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
