cvs: php4 / NEWS /ext/mysql php_mysql.c

zeev Thu Nov 2 16:41:30 2000 EDT Modified files: /php4 NEWS /php4/ext/mysql php_mysql.c Log: Fix mysql_close() Index: php4/NEWS diff -u php4/NEWS:1.503 php4/NEWS:1.504 --- php4/NEWS:1.503 Thu Nov 2 15:18:08 2000 +++ php4/NEWS Thu Nov 2 16:41:29 2000 @@ -1,8 +1,8 @@ PHP 4.0 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| - ?? ??? 2000, Version 4.0.4 +- Fixed mysql_close() - it wasn't properly closing MySQL connections (Zeev) - Made print_r support recursive data structures, e.g., $GLOBALS. (Zeev) - Fixed a bug that caused PHP not to properly flush its output buffer, if more than one output buffer was used. (Zeev) Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.56 php4/ext/mysql/php_mysql.c:1.57 --- php4/ext/mysql/php_mysql.c:1.56 Wed Oct 25 10:43:57 2000 +++ php4/ext/mysql/php_mysql.c Thu Nov 2 16:41:29 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.56 2000/10/25 17:43:57 andrei Exp $ */ +/* $Id: php_mysql.c,v 1.57 2000/11/03 00:41:29 zeev Exp $ */ /* TODO: @@ -603,7 +603,10 @@ } ZEND_FETCH_RESOURCE2(mysql, MYSQL *, mysql_link, id, "MySQL-Link", le_link, le_plink); - zend_list_delete(id); + zend_list_delete(Z_RESVAL_PP(mysql_link)); + if (Z_RESVAL_PP(mysql_link)==MySG(default_link)) { + zend_list_delete(MySG(default_link)); + } RETURN_TRUE; } /* }}} */