diff options
| author | Andrey Hristov <andrey@php.net> | 2008-07-22 23:43:14 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-07-22 23:43:14 +0000 |
| commit | 9f0b69086c14d9b6de2f90e38a95283f815a2f59 (patch) | |
| tree | b6f3352907b867da18982687b8cd265a13a6d732 /ext/mysql/php_mysql.c | |
| parent | 32f51050bcc468b2314c6de89d5403d5291698ef (diff) | |
| download | php-git-9f0b69086c14d9b6de2f90e38a95283f815a2f59.tar.gz | |
Two less failing tests, one of which was definitely a leak in mysqli with mysqlnd
and pconn. ext/mysql is being fixed with a better fix for similar leak.
Diffstat (limited to 'ext/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index c767d849a9..b51b70f7db 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -802,6 +802,9 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) mysql->active_result_id = 0; mysql->multi_query = client_flags & CLIENT_MULTI_STATEMENTS? 1:0; /* ensure that the link did not die */ +#if defined(MYSQL_USE_MYSQLND) + mysqlnd_end_psession(mysql->conn); +#endif if (mysql_ping(mysql->conn)) { if (mysql_errno(mysql->conn) == 2006) { if (UG(unicode)) { @@ -1005,15 +1008,6 @@ PHP_FUNCTION(mysql_close) ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink); -#ifdef MYSQL_USE_MYSQLND - { - int tmp; - if ((mysql = zend_list_find(Z_RESVAL_PP(mysql_link), &tmp)) && tmp == le_plink) { - mysqlnd_end_psession(mysql->conn); - } - } -#endif - if (id==-1) { /* explicit resource number */ PHPMY_UNBUFFERED_QUERY_CHECK(); zend_list_delete(Z_RESVAL_PP(mysql_link)); |