svn: php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/spl/spl_directory.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/spl/spl_directory.c
trunk/ext/spl/spl_directory.c

jani Thu, 23 Jul 2009 14:42:46 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=284648 Log: - Fixed bug #49032 (SplFileObject::fscanf() variables passed by reference) Bug: http://bugs.php.net/49032 (Verified) SplFileObject::fscanf pass-by-reference values Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/spl/spl_directory.c U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c U php/php-src/trunk/ext/spl/spl_directory.c Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2009-07-23 13:45:59 UTC (rev 284647) +++ php/php-src/branches/PHP_5_2/NEWS 2009-07-23 14:42:46 UTC (rev 284648) @@ -4,6 +4,8 @@ - Fixed regression in cURL extension that prevented flush of data to output defined as a file handle. (Ilia) +- Fixed bug #49032 (SplFileObject::fscanf() variables passed by reference). + (Jani) - Fixed bug #48980 (Crash when compiling with pdo_firebird). (Felipe) - Fixed bug #48962 (cURL does not upload files with specified filename). (Ilia) Modified: php/php-src/branches/PHP_5_2/ext/spl/spl_directory.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/spl/spl_directory.c 2009-07-23 13:45:59 UTC (rev 284647) +++ php/php-src/branches/PHP_5_2/ext/spl/spl_directory.c 2009-07-23 14:42:46 UTC (rev 284648) @@ -2264,8 +2264,9 @@ ZEND_END_ARG_INFO() static -ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 1, 0, 1) ZEND_ARG_INFO(0, format) + ZEND_ARG_INFO(1, ...) ZEND_END_ARG_INFO() static Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2009-07-23 13:45:59 UTC (rev 284647) +++ php/php-src/branches/PHP_5_3/NEWS 2009-07-23 14:42:46 UTC (rev 284648) @@ -6,6 +6,8 @@ - Fixed open_basedir circumvention for mail.log. (Maksymilian Arciemowicz, Stas) +- Fixed bug #49032 (SplFileObject::fscanf() variables passed by reference). + (Jani) - Fixed bug #49012 (phar tar signature algorithm reports as Unknown (0) in getSignature() call). (Greg) - Fixed bug #49020 (phar misinterprets ustar long filename standard). Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c 2009-07-23 13:45:59 UTC (rev 284647) +++ php/php-src/branches/PHP_5_3/ext/spl/spl_directory.c 2009-07-23 14:42:46 UTC (rev 284648) @@ -2567,8 +2567,9 @@ ZEND_ARG_INFO(0, allowable_tags) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 1, 0, 1) ZEND_ARG_INFO(0, format) + ZEND_ARG_INFO(1, ...) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fwrite, 0, 0, 1) Modified: php/php-src/trunk/ext/spl/spl_directory.c =================================================================== --- php/php-src/trunk/ext/spl/spl_directory.c 2009-07-23 13:45:59 UTC (rev 284647) +++ php/php-src/trunk/ext/spl/spl_directory.c 2009-07-23 14:42:46 UTC (rev 284648) @@ -2696,8 +2696,9 @@ ZEND_ARG_INFO(0, allowable_tags) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 1, 0, 1) ZEND_ARG_INFO(0, format) + ZEND_ARG_INFO(1, ...) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fwrite, 0, 0, 1)