Fix mysql_close()

diff --git a/NEWS b/NEWS
index 3333849d287eb29293f4179dad846232a7c09cda..94845986a5a82c427aa3a943301985b000f2a406 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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)

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index c397a96ce8d89b7569c47c04678366e6c39b6143..af8cafb3017f2963a3bb22b01a7f8b3cd8d63c6d 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -603,7 +603,10 @@ PHP_FUNCTION(mysql_close)
        }
        
        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;
 }
 /* }}} */