From ccfe4bf7368b2546c8718b29d34e6a97bcdc93de Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Tue, 13 Jul 2004 13:15:35 +0000 Subject: 4.3.8 patches. --- ext/mysql/php_mysql.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ext/mysql/php_mysql.c') diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index ad610e8b30..9e91c263cd 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -259,6 +259,9 @@ static void _free_mysql_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) */ static void php_mysql_set_default_link(int id TSRMLS_DC) { + if (MySG(default_link) != -1) { + zend_list_delete(MySG(default_link)); + } MySG(default_link) = id; zend_list_addref(id); } @@ -590,7 +593,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) break; } /* disable local infile option for open_basedir */ - if (PG(open_basedir) && strlen(PG(open_basedir))) { + if (PG(open_basedir) && strlen(PG(open_basedir)) && (client_flags & CLIENT_LOCAL_FILES)) { client_flags ^= CLIENT_LOCAL_FILES; } -- cgit v1.2.1