From: Zeev Suraski <zeev@php.net>
Date: Fri, 3 Nov 2000 00:41:29 +0000 (+0000)
Subject: Fix mysql_close()
X-Git-Tag: php-4.0.4RC3~357
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6451d5845526a632fd06737a3f74683b4f151258;p=php

Fix mysql_close()
---

diff --git a/NEWS b/NEWS
index 3333849d28..94845986a5 100644
--- 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 c397a96ce8..af8cafb301 100644
--- 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;
 }
 /* }}} */