[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Mar 11 01:31:31 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2983r2=1.2984diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2983 php-src/ChangeLog:1.2984 --- php-src/ChangeLog:1.2983Mon Mar 10 01:31:31 2008 +++ php-src/ChangeLog Tue Mar 11 01:31:30 2008 @@ -1,3 +1,251 @@ +2008-03-10 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + ZendEngine2/tests/014.phpt + ZendEngine2/tests/017.phpt + ext/filter/tests/008.phpt + ext/standard/tests/class_object/get_declared_classes_error_001.phpt + ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt + ext/standard/tests/dir/getcwd_error.phpt + ext/standard/tests/file/clearstatcache_error.phpt + ext/standard/tests/file/get_current_user.phpt + ext/standard/tests/general_functions/rand.phpt + ext/standard/tests/math/getrandmax_error.phpt + ext/standard/tests/math/mt_getrandmax_error.phpt + ext/xmlwriter/tests/bug41326.phpt: + Fix tests (new error message for void parameters) + +* (PHP_5_3) + ZendEngine2/zend_API.h + ZendEngine2/zend_builtin_functions.c + ZendEngine2/zend_exceptions.c: + MFH: Added new macro for check void parameters. + (deprecating ZEND_WRONG_PARAM_COUNT for this cases) + +2008-03-10 Andrey Hristov [EMAIL PROTECTED] + +* ext/mysql/config.m4 + ext/mysql/config.m4 + ext/mysql/config.w32 + ext/mysql/config.w32 + ext/mysql/php_mysql.c + ext/mysql/php_mysql.c + ext/mysql/php_mysql_structs.h + ext/mysql/php_mysql_structs.h + ext/mysqli/config.m4 + ext/mysqli/config.m4 + ext/mysqli/config.w32 + ext/mysqli/config.w32 + ext/mysqli/mysqli.c + ext/mysqli/mysqli.c + ext/mysqli/mysqli_api.c + ext/mysqli/mysqli_api.c + ext/mysqli/mysqli_fe.c + ext/mysqli/mysqli_fe.c + ext/mysqli/mysqli_nonapi.c + ext/mysqli/mysqli_nonapi.c + ext/mysqli/mysqli_warning.c + ext/mysqli/mysqli_warning.c + ext/mysqli/php_mysqli_structs.h + ext/mysqli/php_mysqli_structs.h + ext/mysqlnd/config9.m4 + ext/mysqlnd/config9.m4: + Update mysqlnd, ext/mysql and ext/mysqli - now possible to compile with + different + configurations one or the another extension to use libmysql or mysqlnd + mixed in + one binary + +* (PHP_5_2) + main/network.c + main/streams/xp_socket.c: + char **error_string was passed but not used. This causes problems in cases + of getaddrinfo() failure, because the upper layers don't get the error. + initialize a variable because we were reading initialized in case of + error. + +* main/network.c + main/streams/xp_socket.c: +char **error_message was passed but not used. This causes problems in + cases +of getaddrinfo() failure, because the upper layers don't get the error. +initialize a variable because we were reading initialized in case of + error. + +* (PHP_5_3) + main/network.c + main/streams/xp_socket.c: + char **error_message was passed but not used. This causes problems in cases + of getaddrinfo() failure, because the upper layers don't get the error. + initialize a variable because we were reading initialized in case of + error. + +2008-03-10 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_3) + ext/pdo_sqlite/sqlite/src/parse.c: + fix gcov build + +2008-03-10 Josie Messa [EMAIL PROTECTED] + +* ext/standard/tests/dir/getcwd_basic.phpt + ext/standard/tests/dir/getcwd_basic.phpt + ext/standard/tests/dir/getcwd_error.phpt + ext/standard/tests/dir/getcwd_error.phpt: + - New tests for getcwd() function + +* ext/standard/tests/dir/getcwd_basic.phpt + ext/standard/tests/dir/getcwd_basic.phpt + ext/standard/tests/dir/getcwd_basic.phpt + ext/standard/tests/dir/getcwd_error.phpt + ext/standard/tests/dir/getcwd_error.phpt + ext/standard/tests/dir/getcwd_error.phpt: +1.1.4; + file getcwd_basic.phpt was initially added on branch PHP_5_2. + +* ext/standard/tests/dir/dir_variation7.phpt + ext/standard/tests/dir/dir_variation7.phpt + ext/standard/tests/dir/dir_variation7.phpt + ext/standard/tests/dir/opendir_error2.phpt + ext/standard/tests/dir/opendir_error2.phpt + ext/standard/tests/dir/opendir_error2.phpt + ext/standard/tests/dir/opendir_variation1.phpt + ext/standard/tests/dir/opendir_variation1.phpt + ext/standard/tests/dir/opendir_variation1.phpt + ext/standard/tests/dir/opendir_variation5.phpt + ext/standard/tests/dir/opendir_variation5.phpt + ext/standard/tests/dir/opendir_variation5.phpt + ext/standard/tests/dir/opendir_variation6.phpt + ext/standard/tests/dir/opendir_variation6.phpt +
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Mar 11 01:31:34 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1258r2=1.1259diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1258 ZendEngine2/ChangeLog:1.1259 --- ZendEngine2/ChangeLog:1.1258Mon Mar 10 01:31:34 2008 +++ ZendEngine2/ChangeLog Tue Mar 11 01:31:34 2008 @@ -1,3 +1,30 @@ +2008-03-10 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + tests/014.phpt + tests/017.phpt: + Fix tests (new error message for void parameters) + +* (PHP_5_3) + zend_API.h + zend_builtin_functions.c + zend_exceptions.c: + MFH: Added new macro for check void parameters. + (deprecating ZEND_WRONG_PARAM_COUNT for this cases) + +* Zend.m4: + MFB: Improve the Darwin 9 hack considerably and switch to using dl*() + instead of NS*() on Darwin 8+. (Patch by Gwynne) + +* (PHP_5_3) + Zend.m4: + Improve the Darwin 9 hack considerably and switch to using dl*() instead of + NS*() on Darwin 8+. (Patch by Gwynne) + +* (PHP_5_2) + zend_language_parser.y: + Fixed compilation warnings + 2008-03-09 Antony Dovgal [EMAIL PROTECTED] * (PHP_5_3) @@ -21817,7 +21844,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1258 2008/03/10 01:31:34 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1259 2008/03/11 01:31:34 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -23541,7 +23568,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1258 2008/03/10 01:31:34 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1259 2008/03/11 01:31:34 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
andrey Mon Mar 10 09:22:20 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: Update NEWS http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.132r2=1.2027.2.547.2.965.2.133diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.132 php-src/NEWS:1.2027.2.547.2.965.2.133 --- php-src/NEWS:1.2027.2.547.2.965.2.132 Sat Mar 8 14:58:04 2008 +++ php-src/NEWSMon Mar 10 09:22:19 2008 @@ -126,6 +126,7 @@ - Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf) - Fixed PECL bug #12431 (OCI8 ping functionality is broken). (Oracle Corp.) +- Fixed bug #44371 (mysqli extension compile failed). (Andrey, petr_hroch_info) - Fixed bug #44336 (Improve pcre UTF-8 string matching performance). (frode at coretrek dot com, Nuno) - Fixed bug #44214 (Crash using preg_replace_callback() and global variable). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysql php_mysql.c /ext/mysqli php_mysqli_structs.h
andrey Mon Mar 10 09:16:13 2008 UTC Modified files: /php-src/ext/mysql php_mysql.c /php-src/ext/mysqli php_mysqli_structs.h Log: - Fix a warning in php_mysql.c - Fixed #44371 Extension compile failed http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.255r2=1.256diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.255 php-src/ext/mysql/php_mysql.c:1.256 --- php-src/ext/mysql/php_mysql.c:1.255 Sat Mar 8 15:17:45 2008 +++ php-src/ext/mysql/php_mysql.c Mon Mar 10 09:16:13 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_mysql.c,v 1.255 2008/03/08 15:17:45 andrey Exp $ */ +/* $Id: php_mysql.c,v 1.256 2008/03/10 09:16:13 andrey Exp $ */ /* TODO: * @@ -663,7 +663,7 @@ client_flags ^= CLIENT_LOCAL_FILES; } - hashed_details_length = spprintf(hashed_details, 0, mysql_%s_%s_%s_%d, SAFE_STRING(host_and_port), SAFE_STRING(user), SAFE_STRING(passwd), client_flags); + hashed_details_length = spprintf(hashed_details, 0, mysql_%s_%s_%s_%ld, SAFE_STRING(host_and_port), SAFE_STRING(user), SAFE_STRING(passwd), client_flags); } /* We cannot use mysql_port anymore in windows, need to use http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/php_mysqli_structs.h?r1=1.12r2=1.13diff_format=u Index: php-src/ext/mysqli/php_mysqli_structs.h diff -u php-src/ext/mysqli/php_mysqli_structs.h:1.12 php-src/ext/mysqli/php_mysqli_structs.h:1.13 --- php-src/ext/mysqli/php_mysqli_structs.h:1.12Sat Mar 8 15:16:08 2008 +++ php-src/ext/mysqli/php_mysqli_structs.h Mon Mar 10 09:16:13 2008 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: php_mysqli_structs.h,v 1.12 2008/03/08 15:16:08 andrey Exp $ + $Id: php_mysqli_structs.h,v 1.13 2008/03/10 09:16:13 andrey Exp $ */ #ifndef PHP_MYSQLI_STRUCTS_H @@ -38,11 +38,11 @@ #ifdef HAVE_MYSQLND #include ext/mysqlnd/mysqlnd.h -#include ext/mysqli/mysqli_mysqlnd.h +#include mysqli_mysqlnd.h #else #include mysql.h #include errmsg.h -#include ext/mysqli/mysqli_libmysql.h +#include mysqli_libmysql.h #endif #include php_mysqli.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql php_mysql.c /ext/mysqli php_mysqli_structs.h
andrey Mon Mar 10 09:18:43 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysql php_mysql.c /php-src/ext/mysqli php_mysqli_structs.h Log: - Fix a warning in php_mysql.c - Fixed #44371 Extension compile failed http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.13r2=1.213.2.6.2.16.2.14diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.13 php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.14 --- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.13 Sat Mar 8 15:00:50 2008 +++ php-src/ext/mysql/php_mysql.c Mon Mar 10 09:18:43 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.13 2008/03/08 15:00:50 andrey Exp $ */ +/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.14 2008/03/10 09:18:43 andrey Exp $ */ /* TODO: * @@ -673,7 +673,7 @@ client_flags ^= CLIENT_LOCAL_FILES; } - hashed_details_length = spprintf(hashed_details, 0, mysql_%s_%s_%s_%d, SAFE_STRING(host_and_port), SAFE_STRING(user), SAFE_STRING(passwd), client_flags); + hashed_details_length = spprintf(hashed_details, 0, mysql_%s_%s_%s_%ld, SAFE_STRING(host_and_port), SAFE_STRING(user), SAFE_STRING(passwd), client_flags); } /* We cannot use mysql_port anymore in windows, need to use http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/php_mysqli_structs.h?r1=1.4.2.10r2=1.4.2.11diff_format=u Index: php-src/ext/mysqli/php_mysqli_structs.h diff -u php-src/ext/mysqli/php_mysqli_structs.h:1.4.2.10 php-src/ext/mysqli/php_mysqli_structs.h:1.4.2.11 --- php-src/ext/mysqli/php_mysqli_structs.h:1.4.2.10Sat Mar 8 14:55:52 2008 +++ php-src/ext/mysqli/php_mysqli_structs.h Mon Mar 10 09:18:43 2008 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: php_mysqli_structs.h,v 1.4.2.10 2008/03/08 14:55:52 andrey Exp $ + $Id: php_mysqli_structs.h,v 1.4.2.11 2008/03/10 09:18:43 andrey Exp $ */ #ifndef PHP_MYSQLI_STRUCTS_H @@ -38,11 +38,11 @@ #ifdef HAVE_MYSQLND #include ext/mysqlnd/mysqlnd.h -#include ext/mysqli/mysqli_mysqlnd.h +#include mysqli_mysqlnd.h #else #include mysql.h #include errmsg.h -#include ext/mysqli/mysqli_libmysql.h +#include mysqli_libmysql.h #endif #include php_mysqli.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
As that bug was introduced and fixed before any release, what's the point in mentioning it in NEWS? --Jani On Mon, 2008-03-10 at 09:22 +, Andrey Hristov wrote: andreyMon Mar 10 09:22:20 2008 UTC Modified files: (Branch: PHP_5_3) /php-src NEWS Log: Update NEWS http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.132r2=1.2027.2.547.2.965.2.133diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.132 php-src/NEWS:1.2027.2.547.2.965.2.133 --- php-src/NEWS:1.2027.2.547.2.965.2.132 Sat Mar 8 14:58:04 2008 +++ php-src/NEWS Mon Mar 10 09:22:19 2008 @@ -126,6 +126,7 @@ - Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf) - Fixed PECL bug #12431 (OCI8 ping functionality is broken). (Oracle Corp.) +- Fixed bug #44371 (mysqli extension compile failed). (Andrey, petr_hroch_info) - Fixed bug #44336 (Improve pcre UTF-8 string matching performance). (frode at coretrek dot com, Nuno) - Fixed bug #44214 (Crash using preg_replace_callback() and global variable). -- Patches/Donations: http://pecl.php.net/~jani/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
andrey Mon Mar 10 11:19:24 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: Remove unneeded entry http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.133r2=1.2027.2.547.2.965.2.134diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.133 php-src/NEWS:1.2027.2.547.2.965.2.134 --- php-src/NEWS:1.2027.2.547.2.965.2.133 Mon Mar 10 09:22:19 2008 +++ php-src/NEWSMon Mar 10 11:19:24 2008 @@ -126,7 +126,6 @@ - Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf) - Fixed PECL bug #12431 (OCI8 ping functionality is broken). (Oracle Corp.) -- Fixed bug #44371 (mysqli extension compile failed). (Andrey, petr_hroch_info) - Fixed bug #44336 (Improve pcre UTF-8 string matching performance). (frode at coretrek dot com, Nuno) - Fixed bug #44214 (Crash using preg_replace_callback() and global variable). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
Hi Jani, Jani Taskinen wrote: As that bug was introduced and fixed before any release, what's the point in mentioning it in NEWS? didn't think about this. Will revert. Andrey --Jani On Mon, 2008-03-10 at 09:22 +, Andrey Hristov wrote: andrey Mon Mar 10 09:22:20 2008 UTC Modified files: (Branch: PHP_5_3) /php-src NEWS Log: Update NEWS http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.132r2=1.2027.2.547.2.965.2.133diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.132 php-src/NEWS:1.2027.2.547.2.965.2.133 --- php-src/NEWS:1.2027.2.547.2.965.2.132Sat Mar 8 14:58:04 2008 +++ php-src/NEWS Mon Mar 10 09:22:19 2008 @@ -126,6 +126,7 @@ - Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf) - Fixed PECL bug #12431 (OCI8 ping functionality is broken). (Oracle Corp.) +- Fixed bug #44371 (mysqli extension compile failed). (Andrey, petr_hroch_info) - Fixed bug #44336 (Improve pcre UTF-8 string matching performance). (frode at coretrek dot com, Nuno) - Fixed bug #44214 (Crash using preg_replace_callback() and global variable). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli.c
johannesMon Mar 10 13:26:15 2008 UTC Modified files: /php-src/ext/mysqli mysqli.c Log: - Fix build with older MySQL http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.124r2=1.125diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.124 php-src/ext/mysqli/mysqli.c:1.125 --- php-src/ext/mysqli/mysqli.c:1.124 Sat Mar 8 15:17:45 2008 +++ php-src/ext/mysqli/mysqli.c Mon Mar 10 13:26:15 2008 @@ -17,7 +17,7 @@ | Ulf Wendel [EMAIL PROTECTED] | +--+ - $Id: mysqli.c,v 1.124 2008/03/08 15:17:45 andrey Exp $ + $Id: mysqli.c,v 1.125 2008/03/10 13:26:15 johannes Exp $ */ #ifdef HAVE_CONFIG_H @@ -723,7 +723,9 @@ REGISTER_LONG_CONSTANT(MYSQLI_GROUP_FLAG, GROUP_FLAG, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MYSQLI_ENUM_FLAG, ENUM_FLAG, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MYSQLI_BINARY_FLAG, BINARY_FLAG, CONST_CS | CONST_PERSISTENT); +#if (MYSQL_VERSION_ID 50001 || defined(HAVE_MYSQLND) REGISTER_LONG_CONSTANT(MYSQLI_NO_DEFAULT_VALUE_FLAG, NO_DEFAULT_VALUE_FLAG, CONST_CS | CONST_PERSISTENT); +#endif #if (MYSQL_VERSION_ID 51122 MYSQL_VERSION_ID 6) || (MYSQL_VERSION_ID 60003) || defined(HAVE_MYSQLND) REGISTER_LONG_CONSTANT(MYSQLI_ON_UPDATE_NOW_FLAG, ON_UPDATE_NOW_FLAG, CONST_CS | CONST_PERSISTENT); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli.c
johannesMon Mar 10 13:38:23 2008 UTC Modified files: /php-src/ext/mysqli mysqli.c Log: Fix typo http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.125r2=1.126diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.125 php-src/ext/mysqli/mysqli.c:1.126 --- php-src/ext/mysqli/mysqli.c:1.125 Mon Mar 10 13:26:15 2008 +++ php-src/ext/mysqli/mysqli.c Mon Mar 10 13:38:23 2008 @@ -17,7 +17,7 @@ | Ulf Wendel [EMAIL PROTECTED] | +--+ - $Id: mysqli.c,v 1.125 2008/03/10 13:26:15 johannes Exp $ + $Id: mysqli.c,v 1.126 2008/03/10 13:38:23 johannes Exp $ */ #ifdef HAVE_CONFIG_H @@ -723,7 +723,7 @@ REGISTER_LONG_CONSTANT(MYSQLI_GROUP_FLAG, GROUP_FLAG, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MYSQLI_ENUM_FLAG, ENUM_FLAG, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MYSQLI_BINARY_FLAG, BINARY_FLAG, CONST_CS | CONST_PERSISTENT); -#if (MYSQL_VERSION_ID 50001 || defined(HAVE_MYSQLND) +#if MYSQL_VERSION_ID 50001 || defined(HAVE_MYSQLND) REGISTER_LONG_CONSTANT(MYSQLI_NO_DEFAULT_VALUE_FLAG, NO_DEFAULT_VALUE_FLAG, CONST_CS | CONST_PERSISTENT); #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli.c
johannesMon Mar 10 13:39:54 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqli mysqli.c Log: Fix typo http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.19r2=1.72.2.16.2.17.2.20diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.19 php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.20 --- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.19 Sat Mar 8 15:00:50 2008 +++ php-src/ext/mysqli/mysqli.c Mon Mar 10 13:39:53 2008 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: mysqli.c,v 1.72.2.16.2.17.2.19 2008/03/08 15:00:50 andrey Exp $ + $Id: mysqli.c,v 1.72.2.16.2.17.2.20 2008/03/10 13:39:53 johannes Exp $ */ #ifdef HAVE_CONFIG_H @@ -725,7 +725,9 @@ REGISTER_LONG_CONSTANT(MYSQLI_GROUP_FLAG, GROUP_FLAG, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MYSQLI_ENUM_FLAG, ENUM_FLAG, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MYSQLI_BINARY_FLAG, BINARY_FLAG, CONST_CS | CONST_PERSISTENT); +#if MYSQL_VERSION_ID 50001 || defined(HAVE_MYSQLND) REGISTER_LONG_CONSTANT(MYSQLI_NO_DEFAULT_VALUE_FLAG, NO_DEFAULT_VALUE_FLAG, CONST_CS | CONST_PERSISTENT); +#endif #if (MYSQL_VERSION_ID 51122 MYSQL_VERSION_ID 6) || (MYSQL_VERSION_ID 60003) || defined(HAVE_MYSQLND) REGISTER_LONG_CONSTANT(MYSQLI_ON_UPDATE_NOW_FLAG, ON_UPDATE_NOW_FLAG, CONST_CS | CONST_PERSISTENT); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/dir scandir_basic.phpt scandir_error1.phpt scandir_error2.phpt scandir_variation1.phpt scandir_variation2.phpt scandir_variation3.phpt scandir_varia
jmessa Mon Mar 10 14:09:05 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/dir scandir_variation6.phpt scandir_variation9.phpt scandir_variation7.phpt scandir_error2.phpt scandir_variation2.phpt scandir_variation1.phpt scandir_variation3.phpt scandir_variation4.phpt scandir_error1.phpt scandir_variation5.phpt scandir_variation8.phpt scandir_basic.phpt Log: - New tests for scandir() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation6.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation6.phpt +++ php-src/ext/standard/tests/dir/scandir_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation9.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation9.phpt +++ php-src/ext/standard/tests/dir/scandir_variation9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation7.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation7.phpt +++ php-src/ext/standard/tests/dir/scandir_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_error2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_error2.phpt +++ php-src/ext/standard/tests/dir/scandir_error2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation2.phpt +++ php-src/ext/standard/tests/dir/scandir_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation1.phpt +++ php-src/ext/standard/tests/dir/scandir_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation3.phpt +++ php-src/ext/standard/tests/dir/scandir_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation4.phpt +++ php-src/ext/standard/tests/dir/scandir_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_error1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_error1.phpt +++ php-src/ext/standard/tests/dir/scandir_error1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation5.phpt +++ php-src/ext/standard/tests/dir/scandir_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation8.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation8.phpt +++ php-src/ext/standard/tests/dir/scandir_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_basic.phpt +++ php-src/ext/standard/tests/dir/scandir_basic.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/dir scandir_basic.phpt scandir_error1.phpt scandir_error2.phpt scandir_variation1.phpt scandir_variation2.phpt scandir_variation3.phpt scandir_varia
jmessa Mon Mar 10 14:12:41 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/dir scandir_variation7.phpt scandir_variation4.phpt scandir_variation3.phpt scandir_error1.phpt scandir_variation8.phpt scandir_variation6.phpt scandir_variation2.phpt scandir_variation9.phpt scandir_variation5.phpt scandir_basic.phpt scandir_variation1.phpt scandir_error2.phpt Log: - New tests for scandir() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation7.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation7.phpt +++ php-src/ext/standard/tests/dir/scandir_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation4.phpt +++ php-src/ext/standard/tests/dir/scandir_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation3.phpt +++ php-src/ext/standard/tests/dir/scandir_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_error1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_error1.phpt +++ php-src/ext/standard/tests/dir/scandir_error1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation8.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation8.phpt +++ php-src/ext/standard/tests/dir/scandir_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation6.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation6.phpt +++ php-src/ext/standard/tests/dir/scandir_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation2.phpt +++ php-src/ext/standard/tests/dir/scandir_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation9.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation9.phpt +++ php-src/ext/standard/tests/dir/scandir_variation9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation5.phpt +++ php-src/ext/standard/tests/dir/scandir_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_basic.phpt +++ php-src/ext/standard/tests/dir/scandir_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_variation1.phpt +++ php-src/ext/standard/tests/dir/scandir_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/scandir_error2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/scandir_error2.phpt +++ php-src/ext/standard/tests/dir/scandir_error2.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / README.UNICODE-UPGRADES
gwynne Mon Mar 10 14:27:07 2008 UTC Modified files: /php-srcREADME.UNICODE-UPGRADES Log: Fix small typo http://cvs.php.net/viewvc.cgi/php-src/README.UNICODE-UPGRADES?r1=1.20r2=1.21diff_format=u Index: php-src/README.UNICODE-UPGRADES diff -u php-src/README.UNICODE-UPGRADES:1.20 php-src/README.UNICODE-UPGRADES:1.21 --- php-src/README.UNICODE-UPGRADES:1.20Fri Feb 8 09:28:15 2008 +++ php-src/README.UNICODE-UPGRADES Mon Mar 10 14:27:07 2008 @@ -46,7 +46,7 @@ } value; -Where zstr ia union of char*, UChar*, and void*. +Where zstr is a union of char*, UChar*, and void*. Parameter Parsing API Modifications -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/dir dir_variation7.phpt opendir_error2.phpt opendir_variation1.phpt opendir_variation5.phpt opendir_variation6.phpt
jmessa Mon Mar 10 15:07:21 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/dir opendir_variation5.phpt opendir_variation6.phpt dir_variation7.phpt opendir_error2.phpt opendir_variation1.phpt Log: - Modified expected output to allow tests to work on all platforms http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_variation5.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/dir/opendir_variation5.phpt diff -u php-src/ext/standard/tests/dir/opendir_variation5.phpt:1.1.2.2 php-src/ext/standard/tests/dir/opendir_variation5.phpt:1.1.2.3 --- php-src/ext/standard/tests/dir/opendir_variation5.phpt:1.1.2.2 Tue Mar 4 11:16:39 2008 +++ php-src/ext/standard/tests/dir/opendir_variation5.phpt Mon Mar 10 15:07:20 2008 @@ -93,11 +93,11 @@ -- After restricting 1st level parent directory -- -Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: Permission denied in %s on line %d +Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d bool(false) -- After restricting parent directory -- -Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: Permission denied in %s on line %d +Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d bool(false) ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_variation6.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/dir/opendir_variation6.phpt diff -u php-src/ext/standard/tests/dir/opendir_variation6.phpt:1.1.2.1 php-src/ext/standard/tests/dir/opendir_variation6.phpt:1.1.2.2 --- php-src/ext/standard/tests/dir/opendir_variation6.phpt:1.1.2.1 Tue Mar 4 10:39:31 2008 +++ php-src/ext/standard/tests/dir/opendir_variation6.phpt Mon Mar 10 15:07:20 2008 @@ -45,17 +45,17 @@ -- Wildcard = '*' -- -Warning: opendir(%s/opendir_var*): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(%s/opendir_var*): failed to open dir: %s in %s on line %d bool(false) -Warning: opendir(%s/*): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(%s/*): failed to open dir: %s in %s on line %d bool(false) -- Wildcard = '?' -- -Warning: opendir(%s/opendir_variation6/sub_dir?): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(%s/opendir_variation6/sub_dir?): failed to open dir: %s in %s on line %d bool(false) -Warning: opendir(%s/opendir_variation6/sub?dir1): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(%s/opendir_variation6/sub?dir1): failed to open dir: %s in %s on line %d bool(false) ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/dir_variation7.phpt?r1=1.1.4.3r2=1.1.4.4diff_format=u Index: php-src/ext/standard/tests/dir/dir_variation7.phpt diff -u php-src/ext/standard/tests/dir/dir_variation7.phpt:1.1.4.3 php-src/ext/standard/tests/dir/dir_variation7.phpt:1.1.4.4 --- php-src/ext/standard/tests/dir/dir_variation7.phpt:1.1.4.3 Tue Dec 25 16:16:32 2007 +++ php-src/ext/standard/tests/dir/dir_variation7.phpt Mon Mar 10 15:07:20 2008 @@ -85,10 +85,10 @@ *** Testing dir() : remove execute permission from the parent dir *** -- After restricting 1st level parent directory -- -Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: Permission denied in %s on line %d +Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: %s in %s on line %d bool(false) -- After restricting parent directory -- -Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: Permission denied in %s on line %d +Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: %s in %s on line %d bool(false) Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_error2.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/dir/opendir_error2.phpt diff -u php-src/ext/standard/tests/dir/opendir_error2.phpt:1.1.2.1 php-src/ext/standard/tests/dir/opendir_error2.phpt:1.1.2.2 --- php-src/ext/standard/tests/dir/opendir_error2.phpt:1.1.2.1 Tue Mar 4 10:39:31 2008 +++ php-src/ext/standard/tests/dir/opendir_error2.phpt Mon Mar 10 15:07:20 2008 @@ -27,11 +27,11 @@ -- Pass a non-existent absolute path: -- -Warning: opendir(%s/idonotexist): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(%s/idonotexist): failed to open dir: %s in %s on line %d bool(false) -- Pass a non-existent relative path: -- -Warning: opendir(idonotexist): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(idonotexist):
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/dir dir_variation7.phpt opendir_error2.phpt opendir_variation1.phpt opendir_variation5.phpt opendir_variation6.phpt
jmessa Mon Mar 10 15:10:32 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/dir opendir_error2.phpt opendir_variation1.phpt dir_variation7.phpt opendir_variation6.phpt opendir_variation5.phpt Log: - Modified expected output to allow tests to work on all platforms http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_error2.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/dir/opendir_error2.phpt diff -u php-src/ext/standard/tests/dir/opendir_error2.phpt:1.1.4.2 php-src/ext/standard/tests/dir/opendir_error2.phpt:1.1.4.3 --- php-src/ext/standard/tests/dir/opendir_error2.phpt:1.1.4.2 Tue Mar 4 10:40:36 2008 +++ php-src/ext/standard/tests/dir/opendir_error2.phpt Mon Mar 10 15:10:32 2008 @@ -27,11 +27,11 @@ -- Pass a non-existent absolute path: -- -Warning: opendir(%s/idonotexist): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(%s/idonotexist): failed to open dir: %s in %s on line %d bool(false) -- Pass a non-existent relative path: -- -Warning: opendir(idonotexist): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(idonotexist): failed to open dir: %s in %s on line %d bool(false) ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_variation1.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/dir/opendir_variation1.phpt diff -u php-src/ext/standard/tests/dir/opendir_variation1.phpt:1.1.4.2 php-src/ext/standard/tests/dir/opendir_variation1.phpt:1.1.4.3 --- php-src/ext/standard/tests/dir/opendir_variation1.phpt:1.1.4.2 Tue Mar 4 10:40:36 2008 +++ php-src/ext/standard/tests/dir/opendir_variation1.phpt Mon Mar 10 15:10:32 2008 @@ -115,47 +115,47 @@ -- Iteration 1 -- -Warning: opendir(0): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(0): failed to open dir: %s in %s on line %d bool(false) -- Iteration 2 -- -Warning: opendir(1): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(1): failed to open dir: %s in %s on line %d bool(false) -- Iteration 3 -- -Warning: opendir(12345): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(12345): failed to open dir: %s in %s on line %d bool(false) -- Iteration 4 -- -Warning: opendir(-2345): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(-2345): failed to open dir: %s in %s on line %d bool(false) -- Iteration 5 -- -Warning: opendir(10.5): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(10.5): failed to open dir: %s in %s on line %d bool(false) -- Iteration 6 -- -Warning: opendir(-10.5): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(-10.5): failed to open dir: %s in %s on line %d bool(false) -- Iteration 7 -- -Warning: opendir(123456789000): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(123456789000): failed to open dir: %s in %s on line %d bool(false) -- Iteration 8 -- -Warning: opendir(1.23456789E-9): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(1.23456789E-9): failed to open dir: %s in %s on line %d bool(false) -- Iteration 9 -- -Warning: opendir(0.5): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(0.5): failed to open dir: %s in %s on line %d bool(false) -- Iteration 10 -- @@ -166,7 +166,7 @@ -- Iteration 12 -- -Warning: opendir(1): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(1): failed to open dir: %s in %s on line %d bool(false) -- Iteration 13 -- @@ -174,7 +174,7 @@ -- Iteration 14 -- -Warning: opendir(1): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(1): failed to open dir: %s in %s on line %d bool(false) -- Iteration 15 -- @@ -196,7 +196,7 @@ -- Iteration 20 -- -Warning: opendir(string): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(string): failed to open dir: %s in %s on line %d bool(false) -- Iteration 21 -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/dir_variation7.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u Index: php-src/ext/standard/tests/dir/dir_variation7.phpt diff -u php-src/ext/standard/tests/dir/dir_variation7.phpt:1.1.2.3 php-src/ext/standard/tests/dir/dir_variation7.phpt:1.1.2.4 --- php-src/ext/standard/tests/dir/dir_variation7.phpt:1.1.2.3 Tue Dec 25 16:15:34 2007 +++ php-src/ext/standard/tests/dir/dir_variation7.phpt Mon Mar 10 15:10:32 2008 @@ -85,10 +85,10 @@ *** Testing dir() : remove execute permission from the parent dir *** --
[PHP-CVS] cvs: php-src / configure.in
gwynne Mon Mar 10 15:17:47 2008 UTC Modified files: /php-srcconfigure.in Log: Improve the Darwin 9 hack considerably and switch to using dl*() instead of NS*() on Darwin 8+. http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.648r2=1.649diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.648 php-src/configure.in:1.649 --- php-src/configure.in:1.648 Sun Mar 9 14:27:15 2008 +++ php-src/configure.inMon Mar 10 15:17:47 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.648 2008/03/09 14:27:15 gwynne Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.649 2008/03/10 15:17:47 gwynne Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -129,8 +129,8 @@ php_did_darwin9_cheat=0 case $host_alias in *darwin9*) - echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)' 2/dev/null /dev/null - if test $? -ne 0; then + hasg=`echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)'` + if test x$hasg = x; then php_did_darwin9_cheat=1 CFLAGS=$CFLAGS -gstabs fi @@ -391,7 +391,6 @@ limits.h \ locale.h \ monetary.h \ -mach-o/dyld.h \ netdb.h \ pwd.h \ resolv.h \ @@ -443,6 +442,18 @@ #endif ]) +dnl Don't use mach-o/dyld.h on Darwin 8+, dl* is recommended by Apple from there on +dnl See http://developer.apple.com/documentation/DeveloperTools/Conceptual/MachOTopics/Articles/loading_code.html +case $host_alias in +*darwin[[89]]*) +;; +*) +AC_CHECK_HEADERS([ \ +mach-o/dyld.h +],[],[][]) +;; +esac + PHP_FOPENCOOKIE PHP_BROKEN_GETCWD PHP_BROKEN_GLIBC_FOPEN_APPEND @@ -737,10 +748,6 @@ CXXFLAGS=$CXXFLAGS -O0 fi else - dnl Finish the Darwin hack - if test $php_did_darwin9_cheat -eq 1; then -CFLAGS=`echo $CFLAGS | $SED -e 's/-gstabs//g'` - fi PHP_DEBUG=0 ZEND_DEBUG=no fi @@ -1222,6 +1229,15 @@ CC=$old_CC +dnl Finish the Darwin hack +if test $php_did_darwin9_cheat -eq 1; then + if test $PHP_DEBUG = yes; then +CFLAGS=`echo $CFLAGS | $SED -e 's/-gstabs/-g/g'` + else +CFLAGS=`echo $CFLAGS | $SED -e 's/-gstabs//g'` + fi +fi + PHP_CONFIGURE_PART(Generating files) CXXFLAGS_CLEAN=$CXXFLAGS -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/dir getcwd_basic.phpt getcwd_error.phpt
jmessa Mon Mar 10 15:21:16 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/dir getcwd_error.phpt getcwd_basic.phpt Log: - New tests for getcwd() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/getcwd_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/getcwd_error.phpt +++ php-src/ext/standard/tests/dir/getcwd_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/getcwd_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/getcwd_basic.phpt +++ php-src/ext/standard/tests/dir/getcwd_basic.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/dir getcwd_basic.phpt getcwd_error.phpt
jmessa Mon Mar 10 15:22:47 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/dir getcwd_error.phpt getcwd_basic.phpt Log: - New tests for getcwd() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/getcwd_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/getcwd_error.phpt +++ php-src/ext/standard/tests/dir/getcwd_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/getcwd_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/dir/getcwd_basic.phpt +++ php-src/ext/standard/tests/dir/getcwd_basic.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/dir getcwd_basic.phpt getcwd_error.phpt
jmessa Mon Mar 10 15:24:14 2008 UTC Modified files: /php-src/ext/standard/tests/dir getcwd_basic.phpt getcwd_error.phpt Log: - New tests for getcwd() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/getcwd_basic.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/dir/getcwd_basic.phpt diff -u /dev/null php-src/ext/standard/tests/dir/getcwd_basic.phpt:1.2 --- /dev/null Mon Mar 10 15:24:14 2008 +++ php-src/ext/standard/tests/dir/getcwd_basic.phptMon Mar 10 15:24:14 2008 @@ -0,0 +1,39 @@ +--TEST-- +Test getcwd() function : basic functionality +--FILE-- +?php +/* Prototype : mixed getcwd(void) + * Description: Gets the current directory + * Source code: ext/standard/dir.c + */ + +/* + * Test basic functionality of getcwd() + */ + +echo *** Testing getcwd() : basic functionality ***\n; + +//create temporary directory for test, removed in CLEAN section +$directory = dirname(__FILE__) . /getcwd_basic; +mkdir($directory); + +var_dump(getcwd()); +chdir($directory); +var_dump(getcwd()); +? +===DONE=== +--CLEAN-- +?php +$directory = dirname(__FILE__) . /getcwd_basic; +rmdir($directory); +? +--EXPECTF-- +*** Testing getcwd() : basic functionality *** +string(%d) %s +string(%d) %s%egetcwd_basic +===DONE=== +--UEXPECTF-- +*** Testing getcwd() : basic functionality *** +unicode(%d) %s +unicode(%d) %s%egetcwd_basic +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/getcwd_error.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/dir/getcwd_error.phpt diff -u /dev/null php-src/ext/standard/tests/dir/getcwd_error.phpt:1.2 --- /dev/null Mon Mar 10 15:24:14 2008 +++ php-src/ext/standard/tests/dir/getcwd_error.phptMon Mar 10 15:24:14 2008 @@ -0,0 +1,37 @@ +--TEST-- +Test getcwd() function : error conditions - Incorrect number of arguments +--FILE-- +?php +/* Prototype : mixed getcwd(void) + * Description: Gets the current directory + * Source code: ext/standard/dir.c + */ + +/* + * Pass incorrect number of arguments to getcwd() to test behaviour + */ + +echo *** Testing getcwd() : error conditions ***\n; + +// One argument +echo \n-- Testing getcwd() function with one argument --\n; +$extra_arg = 10; +var_dump( getcwd($extra_arg) ); +? +===DONE=== +--EXPECTF-- +*** Testing getcwd() : error conditions *** + +-- Testing getcwd() function with one argument -- + +Warning: getcwd() expects exactly 0 parameters, 1 given in %s on line %d +NULL +===DONE=== +--UEXPECTF-- +*** Testing getcwd() : error conditions *** + +-- Testing getcwd() function with one argument -- + +Warning: getcwd() expects exactly 0 parameters, 1 given in %s on line %d +NULL +===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/dir dir_variation7.phpt opendir_error2.phpt opendir_variation1.phpt opendir_variation5.phpt opendir_variation6.phpt
jmessa Mon Mar 10 15:20:00 2008 UTC Modified files: /php-src/ext/standard/tests/dir opendir_variation1.phpt opendir_error2.phpt dir_variation7.phpt opendir_variation6.phpt opendir_variation5.phpt Log: - Modified expected output to allow tests to work on all platforms http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/opendir_variation1.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/dir/opendir_variation1.phpt diff -u php-src/ext/standard/tests/dir/opendir_variation1.phpt:1.2 php-src/ext/standard/tests/dir/opendir_variation1.phpt:1.3 --- php-src/ext/standard/tests/dir/opendir_variation1.phpt:1.2 Tue Mar 4 10:45:40 2008 +++ php-src/ext/standard/tests/dir/opendir_variation1.phpt Mon Mar 10 15:19:59 2008 @@ -115,47 +115,47 @@ -- Iteration 1 -- -Warning: opendir(0): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(0): failed to open dir: %s in %s on line %d bool(false) -- Iteration 2 -- -Warning: opendir(1): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(1): failed to open dir: %s in %s on line %d bool(false) -- Iteration 3 -- -Warning: opendir(12345): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(12345): failed to open dir: %s in %s on line %d bool(false) -- Iteration 4 -- -Warning: opendir(-2345): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(-2345): failed to open dir: %s in %s on line %d bool(false) -- Iteration 5 -- -Warning: opendir(10.5): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(10.5): failed to open dir: %s in %s on line %d bool(false) -- Iteration 6 -- -Warning: opendir(-10.5): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(-10.5): failed to open dir: %s in %s on line %d bool(false) -- Iteration 7 -- -Warning: opendir(123456789000): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(123456789000): failed to open dir: %s in %s on line %d bool(false) -- Iteration 8 -- -Warning: opendir(1.23456789E-9): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(1.23456789E-9): failed to open dir: %s in %s on line %d bool(false) -- Iteration 9 -- -Warning: opendir(0.5): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(0.5): failed to open dir: %s in %s on line %d bool(false) -- Iteration 10 -- @@ -166,7 +166,7 @@ -- Iteration 12 -- -Warning: opendir(1): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(1): failed to open dir: %s in %s on line %d bool(false) -- Iteration 13 -- @@ -174,7 +174,7 @@ -- Iteration 14 -- -Warning: opendir(1): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(1): failed to open dir: %s in %s on line %d bool(false) -- Iteration 15 -- @@ -190,7 +190,7 @@ Notice: Array to string conversion in %s on line %d -Warning: opendir(Array): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(Array): failed to open dir: %s in %s on line %d bool(false) -- Iteration 19 -- @@ -198,7 +198,7 @@ -- Iteration 20 -- -Warning: opendir(string): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(string): failed to open dir: %s in %s on line %d bool(false) -- Iteration 21 -- @@ -215,7 +215,7 @@ -- Iteration 25 -- -Warning: opendir(Resource id #%d): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(Resource id #%d): failed to open dir: %s in %s on line %d bool(false) ===DONE=== --UEXPECTF-- @@ -223,47 +223,47 @@ -- Iteration 1 -- -Warning: opendir(0): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(0): failed to open dir: %s in %s on line %d bool(false) -- Iteration 2 -- -Warning: opendir(1): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(1): failed to open dir: %s in %s on line %d bool(false) -- Iteration 3 -- -Warning: opendir(12345): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(12345): failed to open dir: %s in %s on line %d bool(false) -- Iteration 4 -- -Warning: opendir(-2345): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(-2345): failed to open dir: %s in %s on line %d bool(false) -- Iteration 5 -- -Warning: opendir(10.5): failed to open dir: No such file or directory in %s on line %d +Warning: opendir(10.5): failed to open dir: %s in %s on line %d bool(false) -- Iteration 6 -- -Warning: opendir(-10.5): failed to open dir: No such file
[PHP-CVS] cvs: php-src(PHP_5_3) /main network.c /main/streams xp_socket.c
andrey Mon Mar 10 19:54:47 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main network.c
/php-src/main/streams xp_socket.c
Log:
char **error_message was passed but not used. This causes problems in cases
of getaddrinfo() failure, because the upper layers don't get the error.
initialize a variable because we were reading initialized in case of error.
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.6.2.4r2=1.118.2.2.2.6.2.5diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.6.2.4
php-src/main/network.c:1.118.2.2.2.6.2.5
--- php-src/main/network.c:1.118.2.2.2.6.2.4Mon Dec 31 07:17:17 2007
+++ php-src/main/network.c Mon Mar 10 19:54:47 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.118.2.2.2.6.2.4 2007/12/31 07:17:17 sebastian Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.6.2.5 2008/03/10 19:54:47 andrey Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -205,10 +205,12 @@
# endif
if ((n = getaddrinfo(host, NULL, hints, res))) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
php_network_getaddresses: getaddrinfo failed: %s, PHP_GAI_STRERROR(n));
+ spprintf(error_string, 0, php_network_getaddresses:
getaddrinfo failed: %s, PHP_GAI_STRERROR(n));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
*error_string);
return 0;
} else if (res == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
php_network_getaddresses: getaddrinfo failed (null result pointer));
+ spprintf(error_string, 0, php_network_getaddresses:
getaddrinfo failed (null result pointer) errno=%d, errno);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
*error_string);
return 0;
}
@@ -232,7 +234,8 @@
/* XXX NOT THREAD SAFE (is safe under win32) */
host_info = gethostbyname(host);
if (host_info == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
php_network_getaddresses: gethostbyname failed);
+ spprintf(error_string, 0, php_network_getaddresses:
gethostbyname failed. errno=%d, errno);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
*error_string);
return 0;
}
in = *((struct in_addr *) host_info-h_addr);
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.2.2.6.2.2r2=1.33.2.2.2.6.2.3diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.2
php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.3
--- php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.2 Wed Feb 27 00:30:24 2008
+++ php-src/main/streams/xp_socket.cMon Mar 10 19:54:47 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_socket.c,v 1.33.2.2.2.6.2.2 2008/02/27 00:30:24 iliaa Exp $ */
+/* $Id: xp_socket.c,v 1.33.2.2.2.6.2.3 2008/03/10 19:54:47 andrey Exp $ */
#include php.h
#include ext/standard/file.h
@@ -601,7 +601,7 @@
{
char *host = NULL, *bindto = NULL;
int portno, bindport = 0;
- int err;
+ int err = 0;
int ret;
zval **tmpzval = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main network.c /main/streams xp_socket.c
andrey Mon Mar 10 19:55:43 2008 UTC
Modified files:
/php-src/main network.c
/php-src/main/streams xp_socket.c
Log:
char **error_message was passed but not used. This causes problems in cases
of getaddrinfo() failure, because the upper layers don't get the error.
initialize a variable because we were reading initialized in case of error.
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.131r2=1.132diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.131 php-src/main/network.c:1.132
--- php-src/main/network.c:1.131Mon Dec 31 07:12:18 2007
+++ php-src/main/network.c Mon Mar 10 19:55:43 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.131 2007/12/31 07:12:18 sebastian Exp $ */
+/* $Id: network.c,v 1.132 2008/03/10 19:55:43 andrey Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -205,10 +205,12 @@
# endif
if ((n = getaddrinfo(host, NULL, hints, res))) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
php_network_getaddresses: getaddrinfo failed: %s, PHP_GAI_STRERROR(n));
+ spprintf(error_string, 0, php_network_getaddresses:
getaddrinfo failed: %s, PHP_GAI_STRERROR(n));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
*error_string);
return 0;
} else if (res == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
php_network_getaddresses: getaddrinfo failed (null result pointer));
+ spprintf(error_string, 0, php_network_getaddresses:
getaddrinfo failed (null result pointer) errno=%d, errno);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
*error_string);
return 0;
}
@@ -232,7 +234,8 @@
/* XXX NOT THREAD SAFE (is safe under win32) */
host_info = gethostbyname(host);
if (host_info == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
php_network_getaddresses: gethostbyname failed);
+ spprintf(error_string, 0, php_network_getaddresses:
gethostbyname failed. errno=%d, errno);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
*error_string);
return 0;
}
in = *((struct in_addr *) host_info-h_addr);
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.44r2=1.45diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.44
php-src/main/streams/xp_socket.c:1.45
--- php-src/main/streams/xp_socket.c:1.44 Wed Feb 27 00:30:49 2008
+++ php-src/main/streams/xp_socket.cMon Mar 10 19:55:43 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_socket.c,v 1.44 2008/02/27 00:30:49 iliaa Exp $ */
+/* $Id: xp_socket.c,v 1.45 2008/03/10 19:55:43 andrey Exp $ */
#include php.h
#include ext/standard/file.h
@@ -601,7 +601,7 @@
{
char *host = NULL, *bindto = NULL;
int portno, bindport = 0;
- int err;
+ int err = 0;
int ret;
zval **tmpzval = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main network.c /main/streams xp_socket.c
andrey Mon Mar 10 20:09:23 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main network.c
/php-src/main/streams xp_socket.c
Log:
char **error_string was passed but not used. This causes problems in cases
of getaddrinfo() failure, because the upper layers don't get the error.
initialize a variable because we were reading initialized in case of error.
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.7r2=1.118.2.2.2.8diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.7
php-src/main/network.c:1.118.2.2.2.8
--- php-src/main/network.c:1.118.2.2.2.7Mon Dec 31 07:20:15 2007
+++ php-src/main/network.c Mon Mar 10 20:09:22 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.118.2.2.2.7 2007/12/31 07:20:15 sebastian Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.8 2008/03/10 20:09:22 andrey Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -200,10 +200,12 @@
# endif
if ((n = getaddrinfo(host, NULL, hints, res))) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
php_network_getaddresses: getaddrinfo failed: %s, PHP_GAI_STRERROR(n));
+ spprintf(error_string, 0, php_network_getaddresses:
getaddrinfo failed: %s, PHP_GAI_STRERROR(n));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
*error_string);
return 0;
} else if (res == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
php_network_getaddresses: getaddrinfo failed (null result pointer));
+ spprintf(error_string, 0, php_network_getaddresses:
getaddrinfo failed (null result pointer) errno=%d, errno);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
*error_string);
return 0;
}
@@ -227,7 +229,8 @@
/* XXX NOT THREAD SAFE (is safe under win32) */
host_info = gethostbyname(host);
if (host_info == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
php_network_getaddresses: gethostbyname failed);
+ spprintf(error_string, 0, php_network_getaddresses:
gethostbyname failed. errno=%d, errno);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
*error_string);
return 0;
}
in = *((struct in_addr *) host_info-h_addr);
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.2.2.8r2=1.33.2.2.2.9diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.33.2.2.2.8
php-src/main/streams/xp_socket.c:1.33.2.2.2.9
--- php-src/main/streams/xp_socket.c:1.33.2.2.2.8 Wed Feb 27 00:32:39 2008
+++ php-src/main/streams/xp_socket.cMon Mar 10 20:09:22 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_socket.c,v 1.33.2.2.2.8 2008/02/27 00:32:39 iliaa Exp $ */
+/* $Id: xp_socket.c,v 1.33.2.2.2.9 2008/03/10 20:09:22 andrey Exp $ */
#include php.h
#include ext/standard/file.h
@@ -601,7 +601,7 @@
{
char *host = NULL, *bindto = NULL;
int portno, bindport = 0;
- int err;
+ int err = 0;
int ret;
zval **tmpzval = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql config.m4 config.w32 php_mysql.c php_mysql_structs.h /ext/mysqli config.m4 config.w32 mysqli.c mysqli_api.c mysqli_fe.c mysqli_nonapi.c mysqli_warning.c php
andrey Mon Mar 10 20:15:38 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql config.m4 config.w32 php_mysql.c
php_mysql_structs.h
/php-src/ext/mysqli config.m4 config.w32 mysqli.c mysqli_api.c
mysqli_fe.c mysqli_nonapi.c mysqli_warning.c
php_mysqli_structs.h
/php-src/ext/mysqlndconfig9.m4
Log:
Update mysqlnd, ext/mysql and ext/mysqli - now possible to compile with
different
configurations one or the another extension to use libmysql or mysqlnd mixed
in
one binary
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.m4?r1=1.67.2.1.2.1.2.2r2=1.67.2.1.2.1.2.3diff_format=u
Index: php-src/ext/mysql/config.m4
diff -u php-src/ext/mysql/config.m4:1.67.2.1.2.1.2.2
php-src/ext/mysql/config.m4:1.67.2.1.2.1.2.3
--- php-src/ext/mysql/config.m4:1.67.2.1.2.1.2.2Tue Nov 6 10:00:04 2007
+++ php-src/ext/mysql/config.m4 Mon Mar 10 20:15:38 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.67.2.1.2.1.2.2 2007/11/06 10:00:04 jani Exp $
+dnl $Id: config.m4,v 1.67.2.1.2.1.2.3 2008/03/10 20:15:38 andrey Exp $
dnl
AC_DEFUN([MYSQL_LIB_CHK], [
@@ -158,5 +158,6 @@
if test $PHP_MYSQL = mysqlnd; then
PHP_ADD_EXTENSION_DEP(mysql, mysqlnd)
+AC_DEFINE([MYSQL_USE_MYSQLND], 1, [Whether mysqlnd is enabled])
fi
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.w32?r1=1.2.6.3r2=1.2.6.4diff_format=u
Index: php-src/ext/mysql/config.w32
diff -u php-src/ext/mysql/config.w32:1.2.6.3
php-src/ext/mysql/config.w32:1.2.6.4
--- php-src/ext/mysql/config.w32:1.2.6.3Mon Jan 28 22:50:06 2008
+++ php-src/ext/mysql/config.w32Mon Mar 10 20:15:38 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2.6.3 2008/01/28 22:50:06 andrey Exp $
+// $Id: config.w32,v 1.2.6.4 2008/03/10 20:15:38 andrey Exp $
// vim:ft=javascript
ARG_WITH(mysql, MySQL support, no);
@@ -14,7 +14,7 @@
WARNING(mysql not enabled; libraries and headers not
found);
}
} else {
- AC_DEFINE('HAVE_MYSQLND', 1, 'MySQL native driver support
enabled');
+ AC_DEFINE('MYSQL_USE_MYSQLND', 1, 'MySQL native driver support
enabled');
ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
EXTENSION(mysql, php_mysql.c);
AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.14r2=1.213.2.6.2.16.2.15diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.14
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.15
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.14 Mon Mar 10 09:18:43 2008
+++ php-src/ext/mysql/php_mysql.c Mon Mar 10 20:15:38 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.14 2008/03/10 09:18:43 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.15 2008/03/10 20:15:38 andrey Exp $ */
/* TODO:
*
@@ -79,7 +79,7 @@
#define SAFE_STRING(s) ((s)?(s):)
-#if MYSQL_VERSION_ID 32199 || defined(HAVE_MYSQLND)
+#if MYSQL_VERSION_ID 32199 || defined(MYSQL_USE_MYSQLND)
# define mysql_row_length_type unsigned long
# define HAVE_MYSQL_ERRNO
#else
@@ -89,7 +89,7 @@
# endif
#endif
-#if MYSQL_VERSION_ID = 32032 || defined(HAVE_MYSQLND)
+#if MYSQL_VERSION_ID = 32032 || defined(MYSQL_USE_MYSQLND)
#define HAVE_GETINFO_FUNCS
#endif
@@ -125,7 +125,7 @@
int multi_query;
} php_mysql_conn;
-#ifdef HAVE_MYSQLND
+#ifdef MYSQL_USE_MYSQLND
static MYSQLND_ZVAL_PCACHE *mysql_mysqlnd_zval_cache;
static MYSQLND_QCACHE *mysql_mysqlnd_qcache;
#endif
@@ -223,7 +223,7 @@
/* Dependancies */
static const zend_module_dep mysql_deps[] = {
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQL_USE_MYSQLND)
ZEND_MOD_REQUIRED(mysqlnd)
#endif
{NULL, NULL, NULL}
@@ -262,7 +262,7 @@
#define CHECK_LINK(link) { if (link==-1) { php_error_docref(NULL TSRMLS_CC,
E_WARNING, A link to the server could not be established); RETURN_FALSE; } }
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQL_USE_MYSQLND)
#define PHPMY_UNBUFFERED_QUERY_CHECK() \
{\
if (mysql-active_result_id) { \
@@ -401,7 +401,7 @@
STD_PHP_INI_ENTRY(mysql.connect_timeout, 60,
PHP_INI_ALL,OnUpdateLong, connect_timeout,
zend_mysql_globals, mysql_globals)
STD_PHP_INI_BOOLEAN(mysql.trace_mode, 0,
PHP_INI_ALL,OnUpdateLong, trace_mode,
zend_mysql_globals, mysql_globals)
STD_PHP_INI_BOOLEAN(mysql.allow_local_infile, 1,PHP_INI_SYSTEM,
OnUpdateLong, allow_local_infile, zend_mysql_globals,
mysql_globals)
-#ifdef HAVE_MYSQLND
+#ifdef MYSQL_USE_MYSQLND
STD_PHP_INI_ENTRY(mysql.cache_size,
[PHP-CVS] cvs: php-src /ext/mysql config.m4 config.w32 php_mysql.c php_mysql_structs.h /ext/mysqli config.m4 config.w32 mysqli.c mysqli_api.c mysqli_fe.c mysqli_nonapi.c mysqli_warning.c php_mysqli_s
andrey Mon Mar 10 20:27:16 2008 UTC
Modified files:
/php-src/ext/mysql config.m4 config.w32 php_mysql.c
php_mysql_structs.h
/php-src/ext/mysqli config.m4 config.w32 mysqli.c mysqli_api.c
mysqli_fe.c mysqli_nonapi.c mysqli_warning.c
php_mysqli_structs.h
/php-src/ext/mysqlndconfig9.m4
Log:
Update mysqlnd, ext/mysql and ext/mysqli - now possible to compile with
different
configurations one or the another extension to use libmysql or mysqlnd mixed
in
one binary
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.m4?r1=1.73r2=1.74diff_format=u
Index: php-src/ext/mysql/config.m4
diff -u php-src/ext/mysql/config.m4:1.73 php-src/ext/mysql/config.m4:1.74
--- php-src/ext/mysql/config.m4:1.73Fri Jul 27 01:09:17 2007
+++ php-src/ext/mysql/config.m4 Mon Mar 10 20:27:15 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.73 2007/07/27 01:09:17 jani Exp $
+dnl $Id: config.m4,v 1.74 2008/03/10 20:27:15 andrey Exp $
dnl
AC_DEFUN([MYSQL_LIB_CHK], [
@@ -158,5 +158,6 @@
if test $PHP_MYSQL = mysqlnd; then
PHP_ADD_EXTENSION_DEP(mysql, mysqlnd)
+AC_DEFINE([MYSQL_USE_MYSQLND], 1, [Whether mysqlnd is enabled])
fi
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.w32?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/mysql/config.w32
diff -u php-src/ext/mysql/config.w32:1.6 php-src/ext/mysql/config.w32:1.7
--- php-src/ext/mysql/config.w32:1.6Mon Jan 28 22:54:21 2008
+++ php-src/ext/mysql/config.w32Mon Mar 10 20:27:15 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.6 2008/01/28 22:54:21 andrey Exp $
+// $Id: config.w32,v 1.7 2008/03/10 20:27:15 andrey Exp $
// vim:ft=javascript
ARG_WITH(mysql, MySQL support, no);
@@ -14,7 +14,7 @@
WARNING(mysql not enabled; libraries and headers not
found);
}
} else {
- AC_DEFINE('HAVE_MYSQLND', 1, 'MySQL native driver support
enabled');
+ AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'MySQL native driver support
enabled');
ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
EXTENSION(mysql, php_mysql.c);
AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.256r2=1.257diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.256 php-src/ext/mysql/php_mysql.c:1.257
--- php-src/ext/mysql/php_mysql.c:1.256 Mon Mar 10 09:16:13 2008
+++ php-src/ext/mysql/php_mysql.c Mon Mar 10 20:27:15 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.256 2008/03/10 09:16:13 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.257 2008/03/10 20:27:15 andrey Exp $ */
/* TODO:
*
@@ -72,7 +72,7 @@
#define SAFE_STRING(s) ((s)?(s):)
-#if MYSQL_VERSION_ID 32199 || defined(HAVE_MYSQLND)
+#if MYSQL_VERSION_ID 32199 || defined(MYSQL_USE_MYSQLND)
# define mysql_row_length_type unsigned long
# define HAVE_MYSQL_ERRNO
#else
@@ -82,7 +82,7 @@
# endif
#endif
-#if MYSQL_VERSION_ID = 32032 || defined(HAVE_MYSQLND)
+#if MYSQL_VERSION_ID = 32032 || defined(MYSQL_USE_MYSQLND)
#define HAVE_GETINFO_FUNCS
#endif
@@ -118,7 +118,7 @@
int multi_query;
} php_mysql_conn;
-#ifdef HAVE_MYSQLND
+#ifdef MYSQL_USE_MYSQLND
static MYSQLND_ZVAL_PCACHE *mysql_mysqlnd_zval_cache;
static MYSQLND_QCACHE *mysql_mysqlnd_qcache;
#endif
@@ -220,7 +220,7 @@
/* Dependancies */
static const zend_module_dep mysql_deps[] = {
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQL_USE_MYSQLND)
ZEND_MOD_REQUIRED(mysqlnd)
#endif
{NULL, NULL, NULL}
@@ -259,7 +259,7 @@
#define CHECK_LINK(link) { if (link==-1) { php_error_docref(NULL TSRMLS_CC,
E_WARNING, A link to the server could not be established); RETURN_FALSE; } }
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQL_USE_MYSQLND)
#define PHPMY_UNBUFFERED_QUERY_CHECK() \
{\
if (mysql-active_result_id) { \
@@ -398,7 +398,7 @@
STD_PHP_INI_ENTRY(mysql.connect_timeout, 60,
PHP_INI_ALL,OnUpdateLong, connect_timeout,
zend_mysql_globals, mysql_globals)
STD_PHP_INI_BOOLEAN(mysql.trace_mode, 0,
PHP_INI_ALL,OnUpdateLong, trace_mode,
zend_mysql_globals, mysql_globals)
STD_PHP_INI_BOOLEAN(mysql.allow_local_infile, 1,PHP_INI_SYSTEM,
OnUpdateLong, allow_local_infile, zend_mysql_globals,
mysql_globals)
-#ifdef HAVE_MYSQLND
+#ifdef MYSQL_USE_MYSQLND
STD_PHP_INI_ENTRY(mysql.cache_size, 2000,
PHP_INI_SYSTEM, OnUpdateLong, cache_size,
zend_mysql_globals, mysql_globals)
#endif
PHP_INI_END()
@@ -419,7 +419,7 @@
mysql_globals-trace_mode = 0;
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/com_dotnet com_com.c /ext/curl multi.c /ext/date php_date.c /ext/dba dba.c /ext/dom php_dom.h /ext/fdf fdf.c /ext/filter filter.c /ext/gd gd.c /ext/imap ph
felipe Mon Mar 10 22:12:37 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/apache2handlerphp_functions.c
/php-src/sapi/apache_hooks php_apache.c
/php-src/main output.c
/php-src/ext/com_dotnet com_com.c
/php-src/ext/curl multi.c
/php-src/ext/date php_date.c
/php-src/ext/dbadba.c
/php-src/ext/domphp_dom.h
/php-src/ext/fdffdf.c
/php-src/ext/filter filter.c
/php-src/ext/gd gd.c
/php-src/ext/imap php_imap.c
/php-src/ext/interbase interbase.c
/php-src/ext/mhash mhash.c
/php-src/ext/ming ming.c
/php-src/ext/msql php_msql.c
/php-src/ext/odbc php_odbc.c
/php-src/ext/opensslopenssl.c
/php-src/ext/pdopdo_dbh.c pdo_stmt.c
/php-src/ext/posix posix.c
/php-src/ext/sessionsession.c
/php-src/ext/skeleton create_stubs
/php-src/ext/snmp snmp.c
/php-src/ext/soap soap.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/standard basic_functions.c dir.c filestat.c head.c
info.c rand.c streamsfuncs.c string.c
syslog.c user_filters.c
/php-src/ext/tidy tidy.c
/php-src/ext/xmlrpc xmlrpc-epi-php.c
/php-src/ext/xmlwriter php_xmlwriter.c
Log:
MFH: New way for check void parameters
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.18.2.6.2.5.2.2r2=1.18.2.6.2.5.2.3diff_format=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.2
php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.3
--- php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.2Mon Dec
31 07:17:18 2007
+++ php-src/sapi/apache2handler/php_functions.c Mon Mar 10 22:12:33 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_functions.c,v 1.18.2.6.2.5.2.2 2007/12/31 07:17:18 sebastian Exp $
*/
+/* $Id: php_functions.c,v 1.18.2.6.2.5.2.3 2008/03/10 22:12:33 felipe Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -179,8 +179,8 @@
const apr_array_header_t *arr;
char *key, *val;
- if (ZEND_NUM_ARGS()) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
array_init(return_value);
@@ -203,8 +203,8 @@
const apr_array_header_t *arr;
char *key, *val;
- if (ZEND_NUM_ARGS()) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
array_init(return_value);
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.19.2.3.2.5.2.2r2=1.19.2.3.2.5.2.3diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.2
php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.3
--- php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.2 Mon Dec 31
07:17:18 2007
+++ php-src/sapi/apache_hooks/php_apache.c Mon Mar 10 22:12:33 2008
@@ -17,7 +17,7 @@
| David Sklar [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_apache.c,v 1.19.2.3.2.5.2.2 2007/12/31 07:17:18 sebastian Exp $ */
+/* $Id: php_apache.c,v 1.19.2.3.2.5.2.3 2008/03/10 22:12:33 felipe Exp $ */
#include php_apache_http.h
@@ -164,8 +164,8 @@
request_rec *r;
char *s;
- if (ZEND_NUM_ARGS() 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
APREQ_GET_REQUEST(id, r);
@@ -224,8 +224,8 @@
request_rec *r;
long l;
- if (ZEND_NUM_ARGS() 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
APREQ_GET_REQUEST(id, r);
@@ -683,8 +683,8 @@
zval *id;
request_rec *r;
- if (ZEND_NUM_ARGS() 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
APREQ_GET_REQUEST(id, r);
@@ -766,8 +766,8 @@
zval *id;
request_rec *r;
- if (ZEND_NUM_ARGS() 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
APREQ_GET_REQUEST(id, r);
@@ -784,8 +784,8 @@
zval *id;
request_rec *r;
- if (ZEND_NUM_ARGS() 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
APREQ_GET_REQUEST(id, r);
@@ -802,8 +802,8 @@
zval *id;
request_rec *r;
- if (ZEND_NUM_ARGS() 0) {
- WRONG_PARAM_COUNT;
+
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql php_mysql.c
felipe Mon Mar 10 22:15:36 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
Log:
MFH: New way for check void parameters
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.15r2=1.213.2.6.2.16.2.16diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.15
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.16
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.15 Mon Mar 10 20:15:38 2008
+++ php-src/ext/mysql/php_mysql.c Mon Mar 10 22:15:36 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.15 2008/03/10 20:15:38 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.16 2008/03/10 22:15:36 felipe Exp $ */
/* TODO:
*
@@ -1003,8 +1003,8 @@
Returns a string that represents the client library version */
PHP_FUNCTION(mysql_get_client_info)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_STRING((char *)mysql_get_client_info(),1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file clearstatcache_error.phpt get_current_user.phpt /ext/standard/tests/general_functions rand.phpt /ext/standard/tests/math getrandmax_error.php
felipe Mon Mar 10 22:17:59 2008 UTC Modified files: (Branch: PHP_5_3) /ZendEngine2/tests 017.phpt /php-src/ext/standard/tests/fileclearstatcache_error.phpt get_current_user.phpt /php-src/ext/standard/tests/general_functions rand.phpt /php-src/ext/standard/tests/mathgetrandmax_error.phpt mt_getrandmax_error.phpt /php-src/ext/xmlwriter/testsbug41326.phpt Log: Fix tests (new error message for void parameters) http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/017.phpt?r1=1.1.2.6r2=1.1.2.6.2.1diff_format=u Index: ZendEngine2/tests/017.phpt diff -u ZendEngine2/tests/017.phpt:1.1.2.6 ZendEngine2/tests/017.phpt:1.1.2.6.2.1 --- ZendEngine2/tests/017.phpt:1.1.2.6 Wed Aug 8 06:42:10 2007 +++ ZendEngine2/tests/017.phpt Mon Mar 10 22:17:59 2008 @@ -66,12 +66,12 @@ string(5) array int(%d) -Warning: Wrong parameter count for get_defined_functions() in %s on line %d +Warning: get_defined_functions() expects exactly 0 parameters, 1 given in %s on line %d NULL string(5) array int(%d) -Warning: Wrong parameter count for get_declared_interfaces() in %s on line %d +Warning: get_declared_interfaces() expects exactly 0 parameters, 1 given in %s on line %d NULL string(5) array int(%d) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/clearstatcache_error.phpt?r1=1.1.2.1.2.1r2=1.1.2.1.2.2diff_format=u Index: php-src/ext/standard/tests/file/clearstatcache_error.phpt diff -u php-src/ext/standard/tests/file/clearstatcache_error.phpt:1.1.2.1.2.1 php-src/ext/standard/tests/file/clearstatcache_error.phpt:1.1.2.1.2.2 --- php-src/ext/standard/tests/file/clearstatcache_error.phpt:1.1.2.1.2.1 Mon Nov 5 17:43:19 2007 +++ php-src/ext/standard/tests/file/clearstatcache_error.phpt Mon Mar 10 22:17:59 2008 @@ -14,6 +14,6 @@ --EXPECTF-- *** Testing clearstatcache() function: error conditions *** -Warning: Wrong parameter count for clearstatcache() in %s on line %d +Warning: clearstatcache() expects exactly 0 parameters, 1 given in %s on line %d NULL *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/get_current_user.phpt?r1=1.1.2.3r2=1.1.2.3.2.1diff_format=u Index: php-src/ext/standard/tests/file/get_current_user.phpt diff -u php-src/ext/standard/tests/file/get_current_user.phpt:1.1.2.3 php-src/ext/standard/tests/file/get_current_user.phpt:1.1.2.3.2.1 --- php-src/ext/standard/tests/file/get_current_user.phpt:1.1.2.3 Wed Feb 21 19:57:15 2007 +++ php-src/ext/standard/tests/file/get_current_user.phpt Mon Mar 10 22:17:59 2008 @@ -9,7 +9,7 @@ echo Done\n; ? --EXPECTF-- -Warning: Wrong parameter count for get_current_user() in %s on line %d +Warning: get_current_user() expects exactly 0 parameters, 1 given in %s on line %d NULL string(%d) %s Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/rand.phpt?r1=1.1.2.2r2=1.1.2.2.2.1diff_format=u Index: php-src/ext/standard/tests/general_functions/rand.phpt diff -u php-src/ext/standard/tests/general_functions/rand.phpt:1.1.2.2 php-src/ext/standard/tests/general_functions/rand.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/general_functions/rand.phpt:1.1.2.2 Thu Nov 16 13:01:23 2006 +++ php-src/ext/standard/tests/general_functions/rand.phpt Mon Mar 10 22:17:59 2008 @@ -54,10 +54,10 @@ NULL int(%d) -Warning: Wrong parameter count for getrandmax() in %s on line %d +Warning: getrandmax() expects exactly 0 parameters, 1 given in %s on line %d NULL int(%d) -Warning: Wrong parameter count for mt_getrandmax() in %s on line %d +Warning: mt_getrandmax() expects exactly 0 parameters, 1 given in %s on line %d NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/getrandmax_error.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/math/getrandmax_error.phpt diff -u php-src/ext/standard/tests/math/getrandmax_error.phpt:1.1.2.2 php-src/ext/standard/tests/math/getrandmax_error.phpt:1.1.2.3 --- php-src/ext/standard/tests/math/getrandmax_error.phpt:1.1.2.2 Wed Feb 6 08:44:24 2008 +++ php-src/ext/standard/tests/math/getrandmax_error.phpt Mon Mar 10 22:17:59 2008 @@ -5,5 +5,5 @@ var_dump($biggest_int = getrandmax(true)); ? --EXPECTF-- -Warning: Wrong parameter count for getrandmax() in %s on line 2 +Warning: getrandmax() expects exactly 0 parameters, 1 given in %s on line 2 NULL http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/mt_getrandmax_error.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/math/mt_getrandmax_error.phpt diff -u php-src/ext/standard/tests/math/mt_getrandmax_error.phpt:1.1.2.2 php-src/ext/standard/tests/math/mt_getrandmax_error.phpt:1.1.2.3 --- php-src/ext/standard/tests/math/mt_getrandmax_error.phpt:1.1.2.2Wed Feb 6 08:44:24 2008 +++ php-src/ext/standard/tests/math/mt_getrandmax_error.phptMon
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/filter/tests 008.phpt /ext/standard/tests/class_object get_declared_classes_error_001.phpt get_declared_interfaces_error_001.phpt /ext/standard/tests/dir getcwd_
felipe Mon Mar 10 23:14:11 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2/tests 014.phpt
/php-src/ext/filter/tests 008.phpt
/php-src/ext/standard/tests/class_object
get_declared_classes_error_001.phpt
get_declared_interfaces_error_001.phpt
/php-src/ext/standard/tests/dir getcwd_error.phpt
Log:
Fix tests (new error message for void parameters)
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/014.phpt?r1=1.1.2.2r2=1.1.2.2.2.1diff_format=u
Index: ZendEngine2/tests/014.phpt
diff -u ZendEngine2/tests/014.phpt:1.1.2.2
ZendEngine2/tests/014.phpt:1.1.2.2.2.1
--- ZendEngine2/tests/014.phpt:1.1.2.2 Tue Jun 27 21:10:04 2006
+++ ZendEngine2/tests/014.phpt Mon Mar 10 23:14:11 2008
@@ -32,7 +32,7 @@
string(%d) %s
}
-Warning: Wrong parameter count for get_included_files() in %s on line %d
+Warning: get_included_files() expects exactly 0 parameters, 2 given in %s on
line %d
NULL
array(2) {
[0]=
@@ -41,7 +41,7 @@
string(%d) %s
}
-Warning: Wrong parameter count for get_included_files() in %s on line %d
+Warning: get_included_files() expects exactly 0 parameters, 1 given in %s on
line %d
NULL
array(2) {
[0]=
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/008.phpt?r1=1.2.2.3r2=1.2.2.3.2.1diff_format=u
Index: php-src/ext/filter/tests/008.phpt
diff -u php-src/ext/filter/tests/008.phpt:1.2.2.3
php-src/ext/filter/tests/008.phpt:1.2.2.3.2.1
--- php-src/ext/filter/tests/008.phpt:1.2.2.3 Tue Dec 19 14:16:23 2006
+++ php-src/ext/filter/tests/008.phpt Mon Mar 10 23:14:11 2008
@@ -50,6 +50,6 @@
string(8) callback
}
-Warning: Wrong parameter count for filter_list() in %s on line %d
+Warning: filter_list() expects exactly 0 parameters, 1 given in %s on line %d
NULL
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/class_object/get_declared_classes_error_001.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index:
php-src/ext/standard/tests/class_object/get_declared_classes_error_001.phpt
diff -u
php-src/ext/standard/tests/class_object/get_declared_classes_error_001.phpt:1.1.4.2
php-src/ext/standard/tests/class_object/get_declared_classes_error_001.phpt:1.1.4.3
---
php-src/ext/standard/tests/class_object/get_declared_classes_error_001.phpt:1.1.4.2
Thu Mar 6 11:02:37 2008
+++ php-src/ext/standard/tests/class_object/get_declared_classes_error_001.phpt
Mon Mar 10 23:14:11 2008
@@ -22,6 +22,6 @@
-- Testing get_declared_classes() function with one argument --
-Warning: Wrong parameter count for get_declared_classes() in %s on line 13
+Warning: get_declared_classes() expects exactly 0 parameters, 1 given in %s on
line 13
NULL
-Done
\ No newline at end of file
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index:
php-src/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt
diff -u
php-src/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt:1.1.4.2
php-src/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt:1.1.4.3
---
php-src/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt:1.1.4.2
Thu Mar 6 11:02:37 2008
+++
php-src/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt
Mon Mar 10 23:14:11 2008
@@ -22,6 +22,6 @@
-- Testing get_declared_interfaces() function with one argument --
-Warning: Wrong parameter count for get_declared_interfaces() in %s on line 13
+Warning: get_declared_interfaces() expects exactly 0 parameters, 1 given in %s
on line 13
NULL
-Done
\ No newline at end of file
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/dir/getcwd_error.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/ext/standard/tests/dir/getcwd_error.phpt
diff -u php-src/ext/standard/tests/dir/getcwd_error.phpt:1.1.4.2
php-src/ext/standard/tests/dir/getcwd_error.phpt:1.1.4.3
--- php-src/ext/standard/tests/dir/getcwd_error.phpt:1.1.4.2Mon Mar 10
15:22:47 2008
+++ php-src/ext/standard/tests/dir/getcwd_error.phptMon Mar 10 23:14:11 2008
@@ -24,6 +24,6 @@
-- Testing getcwd() function with one argument --
-Warning: Wrong parameter count for getcwd() in %s on line %d
+Warning: getcwd() expects exactly 0 parameters, 1 given in %s on line %d
NULL
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite TODO
iliaa Tue Mar 11 00:12:53 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite TODO Log: More todo items http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/TODO?r1=1.16.6.1r2=1.16.6.2diff_format=u Index: php-src/ext/sqlite/TODO diff -u php-src/ext/sqlite/TODO:1.16.6.1 php-src/ext/sqlite/TODO:1.16.6.2 --- php-src/ext/sqlite/TODO:1.16.6.1Fri Dec 14 01:23:45 2007 +++ php-src/ext/sqlite/TODO Tue Mar 11 00:12:53 2008 @@ -14,4 +14,6 @@ -- Our test suite doesn't allow us to test persistent connections at this time :/ +- Use later version of built-in library + vim:tw=78 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
