cvs: php4 /ext/mysql php_mysql.c
| From: | Zeev Suraski | Date: | Fri, 03 Nov 2000 01:56:47 +0000 |
| Subject: | cvs: php4 /ext/mysql php_mysql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2446@lists.php.net to get a copy of this message | ||
zeev Thu Nov 2 17:56:47 2000 EDT
Modified files:
/php4/ext/mysql php_mysql.c
Log:
Fixed mysql_close() - A bit more complicated than I originally thought
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.57 php4/ext/mysql/php_mysql.c:1.58
--- php4/ext/mysql/php_mysql.c:1.57 Thu Nov 2 16:41:29 2000
+++ php4/ext/mysql/php_mysql.c Thu Nov 2 17:56:47 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.57 2000/11/03 00:41:29 zeev Exp $ */
+/* $Id: php_mysql.c,v 1.58 2000/11/03 01:56:47 zeev Exp $ */
/* TODO:
@@ -603,10 +603,17 @@
}
ZEND_FETCH_RESOURCE2(mysql, MYSQL *, mysql_link, id, "MySQL-Link", le_link, le_plink);
- zend_list_delete(Z_RESVAL_PP(mysql_link));
- if (Z_RESVAL_PP(mysql_link)==MySG(default_link)) {
+
+ if (id==-1) { /* explicit resource number */
+ zend_list_delete(Z_RESVAL_PP(mysql_link));
+ }
+
+ if (id!=-1
+ || (mysql_link && Z_RESVAL_PP(mysql_link)==MySG(default_link))) {
zend_list_delete(MySG(default_link));
+ MySG(default_link) = -1;
}
+
RETURN_TRUE;
}
/* }}} */