iliaa Sun Apr 22 15:19:09 2007 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /php-src/ext/mysql php_mysql.c Log: Fixed bug #41159 (mysql_pconnect() hash does not account for connect flags). http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.655&r2=1.2027.2.547.2.656&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.655 php-src/NEWS:1.2027.2.547.2.656 --- php-src/NEWS:1.2027.2.547.2.655 Thu Apr 19 23:21:21 2007 +++ php-src/NEWS Sun Apr 22 15:19:08 2007 @@ -2,6 +2,8 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Apr 2007, PHP 5.2.2RC2 - Upgraded SQLite 3 to version 3.3.16 (Ilia) +- Fixed bug #41159 (mysql_pconnect() hash does not account for connect + flags). (Ilia) - Fixed bug #41121 (range() overflow handling for large numbers on 32bit machines). (Ilia) - Fixed bug #41109 (recursiveiterator.inc says "implements" Iterator instead of http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.8&r2=1.213.2.6.2.9&diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.8 php-src/ext/mysql/php_mysql.c:1.213.2.6.2.9 --- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.8 Sat Apr 14 10:19:19 2007 +++ php-src/ext/mysql/php_mysql.c Sun Apr 22 15:19:08 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.213.2.6.2.8 2007/04/14 10:19:19 tony2001 Exp $ */ +/* $Id: php_mysql.c,v 1.213.2.6.2.9 2007/04/22 15:19:08 iliaa Exp $ */ /* TODO: * @@ -618,7 +618,7 @@ } } - hashed_details_length = spprintf(&hashed_details, 0, "mysql_%s_%s_%s", SAFE_STRING(host_and_port), SAFE_STRING(user), SAFE_STRING(passwd)); + 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); } /* We cannot use mysql_port anymore in windows, need to use
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php