diff options
Diffstat (limited to 'ext/mysql')
46 files changed, 729 insertions, 789 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index fd7f52ef3a..70bfd7110b 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -158,7 +158,7 @@ if test "$PHP_MYSQL" != "no"; then fi AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) - PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared) + PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_SUBST(MYSQL_SHARED_LIBADD) if test "$PHP_MYSQL" = "yes" || test "$PHP_MYSQL" = "mysqlnd"; then diff --git a/ext/mysql/config.w32 b/ext/mysql/config.w32 index 2a929b4165..0af94d9623 100644 --- a/ext/mysql/config.w32 +++ b/ext/mysql/config.w32 @@ -10,7 +10,7 @@ if (PHP_MYSQL != "no") { PHP_MYSQL = "no"; WARNING("mysql not enabled; mysqlnd is not enabled"); } else { - EXTENSION("mysql", "php_mysql.c"); + EXTENSION("mysql", "php_mysql.c", PHP_MYSQL_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library'); MESSAGE("\tusing mysqlnd build"); } @@ -18,7 +18,7 @@ if (PHP_MYSQL != "no") { if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) && CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL", PHP_MYSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) { - EXTENSION("mysql", "php_mysql.c"); + EXTENSION("mysql", "php_mysql.c", PHP_MYSQL_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library'); MESSAGE("\tusing libmysql"); } else { diff --git a/ext/mysql/mysql.dsp b/ext/mysql/mysql.dsp deleted file mode 100644 index dfc9c63db5..0000000000 --- a/ext/mysql/mysql.dsp +++ /dev/null @@ -1,171 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mysql" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=mysql - Win32 Debug_TS
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "mysql.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "mysql.mak" CFG="mysql - Win32 Debug_TS"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "mysql - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mysql - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mysql - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mysql - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "mysql - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "NDEBUG" /D "MYSQL_EXPORTS" /D "COMPILE_DL_MYSQL" /D HAVE_MYSQL=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D "COMPILE_DL_MYSQL" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40d /d "NDEBUG"
-# ADD RSC /l 0x40d /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php5nts.lib /nologo /dll /machine:I386 /out:"Release/php_mysql.dll" /libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release"
-
-!ELSEIF "$(CFG)" == "mysql - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "MYSQL_EXPORTS" /D "COMPILE_DL_MYSQL" /D HAVE_MYSQL=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D "COMPILE_DL_MYSQL" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40d /d "_DEBUG"
-# ADD RSC /l 0x40d /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php5nts_debug.lib /nologo /dll /debug /machine:I386 /out:"Debug/php_mysql.dll" /pdbtype:sept /libpath:"..\..\..\MySQL\lib\Debug" /libpath:"..\..\Debug"
-
-!ELSEIF "$(CFG)" == "mysql - Win32 Debug_TS"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug_TS"
-# PROP BASE Intermediate_Dir "Debug_TS"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_TS"
-# PROP Intermediate_Dir "Debug_TS"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL_MYSQL" /D HAVE_MYSQL=1 /FR /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "ZTS" /D "MYSQL_EXPORTS" /D "COMPILE_DL_MYSQL" /D HAVE_MYSQL=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D "COMPILE_DL_MYSQL" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40d /d "_DEBUG"
-# ADD RSC /l 0x40d /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php5ts_debug.lib libmySQL.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_mysql.dll" /pdbtype:sept /libpath:"..\..\..\MySQL\lib\Debug" /libpath:"..\..\Debug_TS"
-
-!ELSEIF "$(CFG)" == "mysql - Win32 Release_TS"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release_TS"
-# PROP BASE Intermediate_Dir "Release_TS"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_TS"
-# PROP Intermediate_Dir "Release_TS"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL_MYSQL" /D HAVE_MYSQL=1 /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZTS" /D "MYSQL_EXPORTS" /D "COMPILE_DL_MYSQL" /D HAVE_MYSQL=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D "COMPILE_DL_MYSQL" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40d /d "NDEBUG"
-# ADD RSC /l 0x40d /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php5ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mysql.dll" /libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
-
-!ENDIF
-
-# Begin Target
-
-# Name "mysql - Win32 Release"
-# Name "mysql - Win32 Debug"
-# Name "mysql - Win32 Debug_TS"
-# Name "mysql - Win32 Release_TS"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\php_mysql.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\php_mysql.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE=.\Readme_w32.txt
-# End Source File
-# End Target
-# End Project
diff --git a/ext/mysql/mysql_mysqlnd.h b/ext/mysql/mysql_mysqlnd.h index 0c4c221b15..29ac9838f2 100644 --- a/ext/mysql/mysql_mysqlnd.h +++ b/ext/mysql/mysql_mysqlnd.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 2006-2009 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 8a8a052bf5..02852566ab 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2015 The PHP Group | +----------------------------------------------------------------------+ @@ -35,13 +35,7 @@ #include "ext/standard/php_string.h" #include "ext/standard/basic_functions.h" -#ifdef ZEND_ENGINE_2 -# include "zend_exceptions.h" -#else - /* PHP 4 compat */ -# define OnUpdateLong OnUpdateInt -# define E_STRICT E_NOTICE -#endif +#include "zend_exceptions.h" #if HAVE_MYSQL @@ -80,7 +74,7 @@ static int le_result, le_link, le_plink; #define SAFE_STRING(s) ((s)?(s):"") #if MYSQL_VERSION_ID > 32199 || defined(MYSQL_USE_MYSQLND) -# define mysql_row_length_type unsigned long +# define mysql_row_length_type zend_ulong # define HAVE_MYSQL_ERRNO #else # define mysql_row_length_type unsigned int @@ -121,7 +115,7 @@ static PHP_GINIT_FUNCTION(mysql); typedef struct _php_mysql_conn { MYSQL *conn; - int active_result_id; + zend_resource *active_result_res; int multi_query; } php_mysql_conn; @@ -358,51 +352,57 @@ zend_module_entry mysql_module_entry = { /* }}} */ #ifdef COMPILE_DL_MYSQL +#ifdef ZTS +ZEND_TSRMLS_CACHE_DEFINE; +#endif ZEND_GET_MODULE(mysql) #endif void timeout(int sig); -#define CHECK_LINK(link) { if (link==-1) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "A link to the server could not be established"); RETURN_FALSE; } } +#define CHECK_LINK(link) { if (link == NULL) { php_error_docref(NULL, E_WARNING, "A link to the server could not be established"); RETURN_FALSE; } } #if defined(MYSQL_USE_MYSQLND) -#define PHPMY_UNBUFFERED_QUERY_CHECK() \ -{\ - if (mysql->active_result_id) { \ - do { \ - int type; \ - MYSQL_RES *_mysql_result; \ - \ - _mysql_result = (MYSQL_RES *) zend_list_find(mysql->active_result_id, &type); \ - if (_mysql_result && type==le_result) { \ - if (mysql_result_is_unbuffered(_mysql_result) && !mysql_eof(_mysql_result)) { \ - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Function called without first fetching all rows from a previous unbuffered query"); \ - } \ - zend_list_delete(mysql->active_result_id); \ - mysql->active_result_id = 0; \ - } \ - } while(0); \ - }\ +#define PHPMY_UNBUFFERED_QUERY_CHECK() \ +{ \ + if (mysql->active_result_res) { \ + do { \ + MYSQL_RES *_mysql_result; \ + _mysql_result = (MYSQL_RES *)mysql->active_result_res->ptr; \ + if (_mysql_result && \ + mysql->active_result_res->type == le_result) { \ + if (mysql_result_is_unbuffered(_mysql_result) && \ + !mysql_eof(_mysql_result)) { \ + php_error_docref(NULL, E_NOTICE, \ + "Function called without first fetching all " \ + "rows from a previous unbuffered query"); \ + } \ + zend_list_close(mysql->active_result_res); \ + mysql->active_result_res = NULL; \ + } \ + } while(0); \ + } \ } #else -#define PHPMY_UNBUFFERED_QUERY_CHECK() \ -{ \ - if (mysql->active_result_id) { \ - do { \ - int type; \ - MYSQL_RES *mysql_result; \ - \ - mysql_result = (MYSQL_RES *) zend_list_find(mysql->active_result_id, &type); \ - if (mysql_result && type==le_result) { \ - if (!mysql_eof(mysql_result)) { \ - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Function called without first fetching all rows from a previous unbuffered query"); \ - while (mysql_fetch_row(mysql_result)); \ - } \ - zend_list_delete(mysql->active_result_id); \ - mysql->active_result_id = 0; \ - } \ - } while(0); \ - } \ +#define PHPMY_UNBUFFERED_QUERY_CHECK() \ +{ \ + if (mysql->active_result_res) { \ + do { \ + MYSQL_RES *mysql_result; \ + mysql_result = (MYSQL_RES *) mysql->active_result_res->ptr; \ + if (mysql_result && \ + mysql->active_result_res->type == le_result) { \ + if (!mysql_eof(mysql_result)) { \ + php_error_docref(NULL, E_NOTICE, \ + "Function called without first fetching " \ + "all rows from a previous unbuffered query"); \ + while (mysql_fetch_row(mysql_result)); \ + } \ + zend_list_close(mysql->active_result_res); \ + mysql->active_result_res = NULL; \ + } \ + } while(0); \ + } \ } #endif @@ -410,7 +410,7 @@ void timeout(int sig); * This wrapper is required since mysql_free_result() returns an integer, and * thus, cannot be used directly */ -static void _free_mysql_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) +static void _free_mysql_result(zend_resource *rsrc) { MYSQL_RES *mysql_result = (MYSQL_RES *)rsrc->ptr; @@ -421,19 +421,19 @@ static void _free_mysql_result(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ php_mysql_set_default_link */ -static void php_mysql_set_default_link(int id TSRMLS_DC) +static void php_mysql_set_default_link(zend_resource *link) { - if (MySG(default_link) != -1) { + if (MySG(default_link) != NULL) { zend_list_delete(MySG(default_link)); } - MySG(default_link) = id; - zend_list_addref(id); + ++GC_REFCOUNT(link); + MySG(default_link) = link; } /* }}} */ /* {{{ php_mysql_select_db */ -static int php_mysql_select_db(php_mysql_conn *mysql, char *db TSRMLS_DC) +static int php_mysql_select_db(php_mysql_conn *mysql, char *db) { PHPMY_UNBUFFERED_QUERY_CHECK(); @@ -447,10 +447,10 @@ static int php_mysql_select_db(php_mysql_conn *mysql, char *db TSRMLS_DC) /* {{{ _close_mysql_link */ -static void _close_mysql_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) +static void _close_mysql_link(zend_resource *rsrc) { php_mysql_conn *link = (php_mysql_conn *)rsrc->ptr; - void (*handler) (int); + void (*handler)(int); handler = signal(SIGPIPE, SIG_IGN); mysql_close(link->conn); @@ -462,7 +462,7 @@ static void _close_mysql_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ _close_mysql_plink */ -static void _close_mysql_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) +static void _close_mysql_plink(zend_resource *rsrc) { php_mysql_conn *link = (php_mysql_conn *)rsrc->ptr; void (*handler) (int); @@ -482,7 +482,7 @@ static void _close_mysql_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC) static PHP_INI_MH(OnMySQLPort) { if (new_value != NULL) { /* default port */ - MySG(default_port) = atoi(new_value); + MySG(default_port) = atoi(new_value->val); } else { MySG(default_port) = -1; } @@ -515,6 +515,9 @@ PHP_INI_END() */ static PHP_GINIT_FUNCTION(mysql) { +#if defined(COMPILE_DL_MYSQL) && defined(ZTS) + ZEND_TSRMLS_CACHE_UPDATE; +#endif mysql_globals->num_persistent = 0; mysql_globals->default_socket = NULL; mysql_globals->default_host = NULL; @@ -531,7 +534,7 @@ static PHP_GINIT_FUNCTION(mysql) #ifdef MYSQL_USE_MYSQLND #include "ext/mysqlnd/mysqlnd_reverse_api.h" -static MYSQLND * mysql_convert_zv_to_mysqlnd(zval * zv TSRMLS_DC) +static MYSQLND *mysql_convert_zv_to_mysqlnd(zval *zv) { php_mysql_conn *mysql; @@ -540,9 +543,7 @@ static MYSQLND * mysql_convert_zv_to_mysqlnd(zval * zv TSRMLS_DC) return NULL; } - mysql = (php_mysql_conn *)zend_fetch_resource(&zv TSRMLS_CC, -1, "MySQL-Link", NULL, 2, le_link, le_plink); - - if (!mysql) { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(zv), "MySQL-Link", le_link, le_plink))) { return NULL; } @@ -563,7 +564,7 @@ ZEND_MODULE_STARTUP_D(mysql) le_result = zend_register_list_destructors_ex(_free_mysql_result, NULL, "mysql result", module_number); le_link = zend_register_list_destructors_ex(_close_mysql_link, NULL, "mysql link", module_number); le_plink = zend_register_list_destructors_ex(NULL, _close_mysql_plink, "mysql link persistent", module_number); - Z_TYPE(mysql_module_entry) = type; + mysql_module_entry.type = type; REGISTER_LONG_CONSTANT("MYSQL_ASSOC", MYSQL_ASSOC, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQL_NUM", MYSQL_NUM, CONST_CS | CONST_PERSISTENT); @@ -584,7 +585,7 @@ ZEND_MODULE_STARTUP_D(mysql) #endif #ifdef MYSQL_USE_MYSQLND - mysqlnd_reverse_api_register_api(&mysql_reverse_api TSRMLS_CC); + mysqlnd_reverse_api_register_api(&mysql_reverse_api); #endif return SUCCESS; @@ -626,7 +627,7 @@ PHP_RINIT_FUNCTION(mysql) return FAILURE; } #endif - MySG(default_link)=-1; + MySG(default_link) = NULL; MySG(num_links) = MySG(num_persistent); /* Reset connect error/errno on every request */ MySG(connect_error) = NULL; @@ -637,10 +638,10 @@ PHP_RINIT_FUNCTION(mysql) } /* }}} */ - #if defined(A0) && defined(MYSQL_USE_MYSQLND) -static int php_mysql_persistent_helper(zend_rsrc_list_entry *le TSRMLS_DC) +static int php_mysql_persistent_helper(zval *el) { + zend_resource *le = (zend_resource *)Z_PTR_P(el); if (le->type == le_plink) { mysqlnd_end_psession(((php_mysql_conn *) le->ptr)->conn); } @@ -659,7 +660,7 @@ PHP_RSHUTDOWN_FUNCTION(mysql) if (MySG(trace_mode)) { if (MySG(result_allocated)){ - php_error_docref("function.mysql-free-result" TSRMLS_CC, E_WARNING, "%lu result set(s) not freed. Use mysql_free_result to free result sets which were requested using mysql_query()", MySG(result_allocated)); + php_error_docref("function.mysql-free-result", E_WARNING, "%pu result set(s) not freed. Use mysql_free_result to free result sets which were requested using mysql_query()", MySG(result_allocated)); } } @@ -668,7 +669,7 @@ PHP_RSHUTDOWN_FUNCTION(mysql) } #if defined(A0) && defined(MYSQL_USE_MYSQLND) - zend_hash_apply(&EG(persistent_list), (apply_func_t) php_mysql_persistent_helper TSRMLS_CC); + zend_hash_apply(&EG(persistent_list), (apply_func_t) php_mysql_persistent_helper); #endif return SUCCESS; @@ -683,9 +684,9 @@ PHP_MINFO_FUNCTION(mysql) php_info_print_table_start(); php_info_print_table_header(2, "MySQL Support", "enabled"); - snprintf(buf, sizeof(buf), "%ld", MySG(num_persistent)); + snprintf(buf, sizeof(buf), ZEND_LONG_FMT, MySG(num_persistent)); php_info_print_table_row(2, "Active Persistent Links", buf); - snprintf(buf, sizeof(buf), "%ld", MySG(num_links)); + snprintf(buf, sizeof(buf), ZEND_LONG_FMT, MySG(num_links)); php_info_print_table_row(2, "Active Links", buf); php_info_print_table_row(2, "Client API version", mysql_get_client_info()); #if !defined (PHP_WIN32) && !defined (NETWARE) && !defined(MYSQL_USE_MYSQLND) @@ -719,25 +720,27 @@ PHP_MINFO_FUNCTION(mysql) static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) { - char *user=NULL, *passwd=NULL, *host_and_port=NULL, *socket=NULL, *tmp=NULL, *host=NULL; - int user_len = 0, passwd_len = 0, host_len = 0; - char *hashed_details=NULL; - int hashed_details_length, port = MYSQL_PORT; - long client_flags = 0; - php_mysql_conn *mysql=NULL; + char *user = NULL, *passwd = NULL; + char *host_and_port = NULL, *socket = NULL; + char *tmp = NULL, *host = NULL; + size_t user_len = 0, passwd_len = 0, host_len = 0; + int port = MYSQL_PORT; + zend_long client_flags = 0; + php_mysql_conn *mysql = NULL; #if MYSQL_VERSION_ID <= 32230 void (*handler) (int); #endif - zend_bool free_host=0, new_link=0; - long connect_timeout; + zend_long connect_timeout; + zend_string *hashed_details = NULL; + zend_bool free_host = 0, new_link = 0; - php_error_docref(NULL TSRMLS_CC, + php_error_docref(NULL, E_DEPRECATED, "The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead"); #if !defined(MYSQL_USE_MYSQLND) if ((MYSQL_VERSION_ID / 100) != (mysql_get_client_version() / 100)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Headers and client library minor version mismatch. Headers:%d Library:%ld", MYSQL_VERSION_ID, mysql_get_client_version()); } @@ -754,10 +757,10 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) MySG(default_port) = MYSQL_PORT; if ((serv_ptr = getservbyname("mysql", "tcp"))) { - MySG(default_port) = (uint) ntohs((ushort) serv_ptr->s_port); + MySG(default_port) = (uint)ntohs((ushort)serv_ptr->s_port); } if ((env = getenv("MYSQL_TCP_PORT"))) { - MySG(default_port) = (uint) atoi(env); + MySG(default_port) = (uint)atoi(env); } #else MySG(default_port) = MYSQL_PORT; @@ -766,22 +769,22 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) if (PG(sql_safe_mode)) { if (ZEND_NUM_ARGS()>0) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "SQL safe mode in effect - ignoring host/user/password information"); + php_error_docref(NULL, E_NOTICE, "SQL safe mode in effect - ignoring host/user/password information"); } - host_and_port=passwd=NULL; - user=php_get_current_user(TSRMLS_C); - hashed_details_length = spprintf(&hashed_details, 0, "mysql__%s_", user); + user = php_get_current_user(); + hashed_details = zend_string_alloc(sizeof("mysql___") + strlen(user) - 1, 0); + snprintf(hashed_details->val, hashed_details->len + 1, "mysql__%s_", user); client_flags = CLIENT_INTERACTIVE; } else { /* mysql_pconnect does not support new_link parameter */ if (persistent) { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!s!l", &host_and_port, &host_len, + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!s!s!l", &host_and_port, &host_len, &user, &user_len, &passwd, &passwd_len, &client_flags)==FAILURE) { return; } } else { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!s!bl", &host_and_port, &host_len, + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!s!s!bl", &host_and_port, &host_len, &user, &user_len, &passwd, &passwd_len, &new_link, &client_flags)==FAILURE) { return; @@ -814,13 +817,15 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) #ifdef CLIENT_MULTI_STATEMENTS client_flags &= ~CLIENT_MULTI_STATEMENTS; /* don't allow multi_queries via connect parameter */ #endif - hashed_details_length = spprintf(&hashed_details, 0, "mysql_%s_%s_%s_%ld", SAFE_STRING(host_and_port), SAFE_STRING(user), SAFE_STRING(passwd), client_flags); + hashed_details = zend_string_alloc(sizeof("mysql____") + (host_and_port? strlen(host_and_port) : 0) + + (user? strlen(user) : 0) + (passwd? strlen(passwd) : 0) + MAX_LENGTH_OF_LONG - 1, 0); + hashed_details->len = snprintf(hashed_details->val, hashed_details->len + 1, "mysql_%s_%s_%s_" ZEND_LONG_FMT, SAFE_STRING(host_and_port), SAFE_STRING(user), SAFE_STRING(passwd), client_flags); } /* We cannot use mysql_port anymore in windows, need to use * mysql_real_connect() to set the port. */ - if (host_and_port && (tmp=strchr(host_and_port, ':'))) { + if (host_and_port && (tmp = strchr(host_and_port, ':'))) { host = estrndup(host_and_port, tmp-host_and_port); free_host = 1; tmp++; @@ -843,31 +848,35 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) #endif if (!MySG(allow_persistent)) { - persistent=0; + persistent = 0; } + if (persistent) { - zend_rsrc_list_entry *le; + zend_resource *le; + zend_string *phashed; /* try to find if we already have this link in our persistent list */ - if (zend_hash_find(&EG(persistent_list), hashed_details, hashed_details_length+1, (void **) &le)==FAILURE) { /* we don't */ - zend_rsrc_list_entry new_le; + if ((le = zend_hash_find_ptr(&EG(persistent_list), hashed_details)) == NULL) { /* we don't */ + zval new_le; if (MySG(max_links) != -1 && MySG(num_links) >= MySG(max_links)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", MySG(num_links)); - efree(hashed_details); + php_error_docref(NULL, E_WARNING, "Too many open links (%pd)", MySG(num_links)); + zend_string_release(hashed_details); MYSQL_DO_CONNECT_RETURN_FALSE(); } + if (MySG(max_persistent) != -1 && MySG(num_persistent) >= MySG(max_persistent)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open persistent links (%ld)", MySG(num_persistent)); - efree(hashed_details); + php_error_docref(NULL, E_WARNING, "Too many open persistent links (%pd)", MySG(num_persistent)); + zend_string_release(hashed_details); MYSQL_DO_CONNECT_RETURN_FALSE(); } /* create the link */ - mysql = (php_mysql_conn *) malloc(sizeof(php_mysql_conn)); + mysql = (php_mysql_conn *)malloc(sizeof(php_mysql_conn)); if (!mysql) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Out of memory while allocating memory for a persistent link"); + php_error_docref(NULL, E_ERROR, + "Out of memory while allocating memory for a persistent link"); } - mysql->active_result_id = 0; + mysql->active_result_res = NULL; #ifdef CLIENT_MULTI_STATEMENTS mysql->multi_query = client_flags & CLIENT_MULTI_STATEMENTS? 1:0; #else @@ -886,40 +895,45 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) #ifndef MYSQL_USE_MYSQLND if (mysql_real_connect(mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL) #else - if (mysqlnd_connect(mysql->conn, host, user, passwd, passwd_len, NULL, 0, port, socket, client_flags, MYSQLND_CLIENT_KNOWS_RSET_COPY_DATA TSRMLS_CC) == NULL) + if (mysqlnd_connect(mysql->conn, host, user, passwd, passwd_len, NULL, 0, port, socket, client_flags, MYSQLND_CLIENT_KNOWS_RSET_COPY_DATA) == NULL) #endif { /* Populate connect error globals so that the error functions can read them */ if (MySG(connect_error) != NULL) { efree(MySG(connect_error)); } + MySG(connect_error) = estrdup(mysql_error(mysql->conn)); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", MySG(connect_error)); + php_error_docref(NULL, E_WARNING, "%s", MySG(connect_error)); #if defined(HAVE_MYSQL_ERRNO) MySG(connect_errno) = mysql_errno(mysql->conn); #endif free(mysql); - efree(hashed_details); + zend_string_release(hashed_details); MYSQL_DO_CONNECT_RETURN_FALSE(); } mysql_options(mysql->conn, MYSQL_OPT_LOCAL_INFILE, (char *)&MySG(allow_local_infile)); /* hash it up */ - Z_TYPE(new_le) = le_plink; - new_le.ptr = mysql; - if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_details_length+1, (void *) &new_le, sizeof(zend_rsrc_list_entry), NULL)==FAILURE) { + ZVAL_NEW_PERSISTENT_RES(&new_le, -1, mysql, le_plink); + + /* avoid bogus memleak report */ + phashed = zend_string_init(hashed_details->val, hashed_details->len, 1); + if (zend_hash_update(&EG(persistent_list), phashed, &new_le) == NULL) { + zend_string_release(phashed); free(mysql); - efree(hashed_details); + zend_string_release(hashed_details); MYSQL_DO_CONNECT_RETURN_FALSE(); } + zend_string_release(phashed); MySG(num_persistent)++; MySG(num_links)++; } else { /* The link is in our list of persistent connections */ - if (Z_TYPE_P(le) != le_plink) { + if (le->type != le_plink) { MYSQL_DO_CONNECT_RETURN_FALSE(); } - mysql = (php_mysql_conn *) le->ptr; - mysql->active_result_id = 0; + mysql = (php_mysql_conn *)le->ptr; + mysql->active_result_res = NULL; #ifdef CLIENT_MULTI_STATEMENTS mysql->multi_query = client_flags & CLIENT_MULTI_STATEMENTS? 1:0; #else @@ -934,12 +948,12 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) #ifndef MYSQL_USE_MYSQLND if (mysql_real_connect(mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL) #else - if (mysqlnd_connect(mysql->conn, host, user, passwd, passwd_len, NULL, 0, port, socket, client_flags, MYSQLND_CLIENT_KNOWS_RSET_COPY_DATA TSRMLS_CC) == NULL) + if (mysqlnd_connect(mysql->conn, host, user, passwd, passwd_len, NULL, 0, port, socket, client_flags, MYSQLND_CLIENT_KNOWS_RSET_COPY_DATA) == NULL) #endif { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Link to server lost, unable to reconnect"); - zend_hash_del(&EG(persistent_list), hashed_details, hashed_details_length+1); - efree(hashed_details); + php_error_docref(NULL, E_WARNING, "Link to server lost, unable to reconnect"); + zend_hash_del(&EG(persistent_list), hashed_details); + zend_string_release(hashed_details); MYSQL_DO_CONNECT_RETURN_FALSE(); } mysql_options(mysql->conn, MYSQL_OPT_LOCAL_INFILE, (char *)&MySG(allow_local_infile)); @@ -950,45 +964,44 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) #endif } } - ZEND_REGISTER_RESOURCE(return_value, mysql, le_plink); + ZVAL_RES(return_value, zend_register_resource(mysql, le_plink)); } else { /* non persistent */ - zend_rsrc_list_entry *index_ptr, new_index_ptr; + zend_resource *index_ptr; + zval new_index_ptr; /* first we check the hash for the hashed_details key. if it exists, * it should point us to the right offset where the actual mysql link sits. * if it doesn't, open a new mysql link, add it to the resource list, * and add a pointer to it with hashed_details as the key. */ - if (!new_link && zend_hash_find(&EG(regular_list), hashed_details, hashed_details_length+1,(void **) &index_ptr)==SUCCESS) { - int type; - long link; - void *ptr; + if (!new_link && (index_ptr = zend_hash_find_ptr(&EG(regular_list), hashed_details))) { + zend_resource *link; - if (Z_TYPE_P(index_ptr) != le_index_ptr) { + if (index_ptr->type != le_index_ptr) { MYSQL_DO_CONNECT_RETURN_FALSE(); } - link = (long) index_ptr->ptr; - ptr = zend_list_find(link,&type); /* check if the link is still there */ - if (ptr && (type==le_link || type==le_plink)) { - zend_list_addref(link); - Z_LVAL_P(return_value) = link; - php_mysql_set_default_link(link TSRMLS_CC); - Z_TYPE_P(return_value) = IS_RESOURCE; - efree(hashed_details); + + link = (zend_resource *)index_ptr->ptr; + if (link && (link->type == le_link || link->type == le_plink)) { + GC_REFCOUNT(link)++; + ZVAL_RES(return_value, link); + php_mysql_set_default_link(link); + zend_string_release(hashed_details); MYSQL_DO_CONNECT_CLEANUP(); return; } else { - zend_hash_del(&EG(regular_list), hashed_details, hashed_details_length+1); + zend_hash_del(&EG(regular_list), hashed_details); } } + if (MySG(max_links) != -1 && MySG(num_links) >= MySG(max_links)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", MySG(num_links)); - efree(hashed_details); + php_error_docref(NULL, E_WARNING, "Too many open links (%pd)", MySG(num_links)); + zend_string_release(hashed_details); MYSQL_DO_CONNECT_RETURN_FALSE(); } mysql = (php_mysql_conn *) emalloc(sizeof(php_mysql_conn)); - mysql->active_result_id = 0; + mysql->active_result_res = NULL; #ifdef CLIENT_MULTI_STATEMENTS mysql->multi_query = 1; #endif @@ -1000,8 +1013,8 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) #endif if (!mysql->conn) { MySG(connect_error) = estrdup("OOM"); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "OOM"); - efree(hashed_details); + php_error_docref(NULL, E_WARNING, "OOM"); + zend_string_release(hashed_details); efree(mysql); MYSQL_DO_CONNECT_RETURN_FALSE(); } @@ -1013,7 +1026,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) #ifndef MYSQL_USE_MYSQLND if (mysql_real_connect(mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL) #else - if (mysqlnd_connect(mysql->conn, host, user, passwd, passwd_len, NULL, 0, port, socket, client_flags, MYSQLND_CLIENT_KNOWS_RSET_COPY_DATA TSRMLS_CC) == NULL) + if (mysqlnd_connect(mysql->conn, host, user, passwd, passwd_len, NULL, 0, port, socket, client_flags, MYSQLND_CLIENT_KNOWS_RSET_COPY_DATA) == NULL) #endif { /* Populate connect error globals so that the error functions can read them */ @@ -1021,7 +1034,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) efree(MySG(connect_error)); } MySG(connect_error) = estrdup(mysql_error(mysql->conn)); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", MySG(connect_error)); + php_error_docref(NULL, E_WARNING, "%s", MySG(connect_error)); #if defined(HAVE_MYSQL_ERRNO) MySG(connect_errno) = mysql_errno(mysql->conn); #endif @@ -1029,37 +1042,38 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) #ifdef MYSQL_USE_MYSQLND mysqlnd_close(mysql->conn, MYSQLND_CLOSE_DISCONNECTED); #endif - efree(hashed_details); + zend_string_release(hashed_details); efree(mysql); MYSQL_DO_CONNECT_RETURN_FALSE(); } mysql_options(mysql->conn, MYSQL_OPT_LOCAL_INFILE, (char *)&MySG(allow_local_infile)); /* add it to the list */ - ZEND_REGISTER_RESOURCE(return_value, mysql, le_link); + ZVAL_RES(return_value, zend_register_resource(mysql, le_link)); /* add it to the hash */ - new_index_ptr.ptr = (void *) Z_LVAL_P(return_value); - Z_TYPE(new_index_ptr) = le_index_ptr; - if (zend_hash_update(&EG(regular_list), hashed_details, hashed_details_length+1,(void *) &new_index_ptr, sizeof(zend_rsrc_list_entry), NULL)==FAILURE) { - efree(hashed_details); + ZVAL_NEW_RES(&new_index_ptr, -1, Z_RES_P(return_value), le_index_ptr); + if (zend_hash_update(&EG(regular_list), hashed_details, &new_index_ptr) == NULL) { + zval_ptr_dtor(return_value); + zend_string_release(hashed_details); MYSQL_DO_CONNECT_RETURN_FALSE(); } + Z_ADDREF_P(return_value); MySG(num_links)++; } - efree(hashed_details); - php_mysql_set_default_link(Z_LVAL_P(return_value) TSRMLS_CC); + zend_string_release(hashed_details); + php_mysql_set_default_link(Z_RES_P(return_value)); MYSQL_DO_CONNECT_CLEANUP(); } /* }}} */ /* {{{ php_mysql_get_default_link */ -static int php_mysql_get_default_link(INTERNAL_FUNCTION_PARAMETERS) +static zend_resource *php_mysql_get_default_link(INTERNAL_FUNCTION_PARAMETERS) { - if (MySG(default_link)==-1) { /* no link opened yet, implicitly open one */ - ht = 0; + if (MySG(default_link) == NULL) { /* no link opened yet, implicitly open one */ + ZEND_NUM_ARGS() = 0; php_mysql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } return MySG(default_link); @@ -1086,38 +1100,45 @@ PHP_FUNCTION(mysql_pconnect) Close a MySQL connection */ PHP_FUNCTION(mysql_close) { - int resource_id; - zval *mysql_link=NULL; + zend_resource *res; + zval *mysql_link = NULL; php_mysql_conn *mysql; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &mysql_link) == FAILURE) { return; } if (mysql_link) { - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, -1, "MySQL-Link", le_link, le_plink); + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } else { - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, NULL, MySG(default_link), "MySQL-Link", le_link, le_plink); + if (!MySG(default_link)) { + zend_fetch_resource2_ex(NULL, "MySQL-Link", le_link, le_plink); /* trigger a warning to be consistent */ + RETURN_FALSE; + } + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(MySG(default_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - resource_id = mysql_link ? Z_RESVAL_P(mysql_link) : MySG(default_link); + res = mysql_link ? Z_RES_P(mysql_link) : MySG(default_link); PHPMY_UNBUFFERED_QUERY_CHECK(); + if (res) { #ifdef MYSQL_USE_MYSQLND - { - int tmp; - if ((mysql = zend_list_find(resource_id, &tmp)) && tmp == le_plink) { + if (res->type == le_plink) { mysqlnd_end_psession(mysql->conn); } - } #endif - zend_list_delete(resource_id); - - if (!mysql_link - || (mysql_link && Z_RESVAL_P(mysql_link)==MySG(default_link))) { - MySG(default_link) = -1; + if (res == MySG(default_link)) { + zend_list_delete(res); + MySG(default_link) = NULL; + } if (mysql_link) { - /* on an explicit close of the default connection it had a refcount of 2 so we need one more call */ - zend_list_delete(resource_id); + /* we have at least 3 additional references to this resource ??? */ + if (GC_REFCOUNT(res) <= 3) { + zend_list_close(res); + } } } @@ -1130,23 +1151,25 @@ PHP_FUNCTION(mysql_close) PHP_FUNCTION(mysql_select_db) { char *db; - int db_len; - zval *mysql_link = NULL; - int id = -1; + size_t db_len; php_mysql_conn *mysql; + zval *mysql_link = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &db, &db_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|r", &db, &db_len, &mysql_link) == FAILURE) { return; } if (!mysql_link) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - - if (php_mysql_select_db(mysql, db TSRMLS_CC)) { + if (php_mysql_select_db(mysql, db)) { RETURN_TRUE; } else { RETURN_FALSE; @@ -1164,7 +1187,7 @@ PHP_FUNCTION(mysql_get_client_info) return; } - RETURN_STRING((char *)mysql_get_client_info(),1); + RETURN_STRING((char *)mysql_get_client_info()); } /* }}} */ @@ -1173,21 +1196,23 @@ PHP_FUNCTION(mysql_get_client_info) PHP_FUNCTION(mysql_get_host_info) { zval *mysql_link = NULL; - int id = -1; php_mysql_conn *mysql; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &mysql_link) == FAILURE) { return; } if (!mysql_link) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - - RETURN_STRING((char *)mysql_get_host_info(mysql->conn),1); + RETURN_STRING((char *)mysql_get_host_info(mysql->conn)); } /* }}} */ @@ -1196,20 +1221,22 @@ PHP_FUNCTION(mysql_get_host_info) PHP_FUNCTION(mysql_get_proto_info) { zval *mysql_link = NULL; - int id = -1; php_mysql_conn *mysql; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &mysql_link) == FAILURE) { return; } if (!mysql_link) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - RETURN_LONG(mysql_get_proto_info(mysql->conn)); } /* }}} */ @@ -1219,21 +1246,23 @@ PHP_FUNCTION(mysql_get_proto_info) PHP_FUNCTION(mysql_get_server_info) { zval *mysql_link = NULL; - int id = -1; php_mysql_conn *mysql; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &mysql_link) == FAILURE) { return; } if (!mysql_link) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - - RETURN_STRING((char *)mysql_get_server_info(mysql->conn),1); + RETURN_STRING((char *)mysql_get_server_info(mysql->conn)); } /* }}} */ @@ -1241,24 +1270,26 @@ PHP_FUNCTION(mysql_get_server_info) Returns a string containing information about the most recent query */ PHP_FUNCTION(mysql_info) { - zval *mysql_link = NULL; - int id = -1; char *str; + zval *mysql_link = NULL; php_mysql_conn *mysql; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &mysql_link) == FAILURE) { return; } - if (ZEND_NUM_ARGS() == 0) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + if (!mysql_link) { + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - if ((str = (char *)mysql_info(mysql->conn))) { - RETURN_STRING(str,1); + RETURN_STRING(str); } else { RETURN_FALSE; } @@ -1270,20 +1301,23 @@ PHP_FUNCTION(mysql_info) PHP_FUNCTION(mysql_thread_id) { zval *mysql_link = NULL; - int id = -1; php_mysql_conn *mysql; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &mysql_link) == FAILURE) { return; } - if (ZEND_NUM_ARGS() == 0) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + if (!mysql_link) { + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - RETURN_LONG((long) mysql_thread_id(mysql->conn)); + RETURN_LONG((zend_long) mysql_thread_id(mysql->conn)); } /* }}} */ @@ -1291,31 +1325,36 @@ PHP_FUNCTION(mysql_thread_id) Returns a string containing status information */ PHP_FUNCTION(mysql_stat) { - zval *mysql_link = NULL; - int id = -1; php_mysql_conn *mysql; + zval *mysql_link = NULL; +#ifndef MYSQL_USE_MYSQLND char *stat; -#ifdef MYSQL_USE_MYSQLND - uint stat_len; +#else + zend_string *stat; #endif - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { + + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &mysql_link) == FAILURE) { return; } - if (ZEND_NUM_ARGS() == 0) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + if (!mysql_link) { + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); PHPMY_UNBUFFERED_QUERY_CHECK(); #ifndef MYSQL_USE_MYSQLND if ((stat = (char *)mysql_stat(mysql->conn))) { - RETURN_STRING(stat, 1); + RETURN_STRING(stat); #else - if (mysqlnd_stat(mysql->conn, &stat, &stat_len) == PASS) { - RETURN_STRINGL(stat, stat_len, 0); + if (mysqlnd_stat(mysql->conn, &stat) == PASS) { + RETURN_STR(stat); #endif } else { RETURN_FALSE; @@ -1327,21 +1366,24 @@ PHP_FUNCTION(mysql_stat) Returns the default character set for the current connection */ PHP_FUNCTION(mysql_client_encoding) { - zval *mysql_link = NULL; - int id = -1; php_mysql_conn *mysql; + zval *mysql_link = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &mysql_link) == FAILURE) { return; } - if (ZEND_NUM_ARGS() == 0) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + if (!mysql_link) { + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - RETURN_STRING((char *)mysql_character_set_name(mysql->conn), 1); + RETURN_STRING((char *)mysql_character_set_name(mysql->conn)); } /* }}} */ #endif @@ -1351,22 +1393,25 @@ PHP_FUNCTION(mysql_client_encoding) sets client character set */ PHP_FUNCTION(mysql_set_charset) { - zval *mysql_link = NULL; char *csname; - int id = -1, csname_len; + size_t csname_len; php_mysql_conn *mysql; + zval *mysql_link = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &csname, &csname_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|r", &csname, &csname_len, &mysql_link) == FAILURE) { return; } - if (ZEND_NUM_ARGS() == 1) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + if (!mysql_link) { + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - if (!mysql_set_character_set(mysql->conn, csname)) { RETURN_TRUE; } else { @@ -1383,22 +1428,24 @@ PHP_FUNCTION(mysql_set_charset) PHP_FUNCTION(mysql_create_db) { char *db; - int db_len; - zval *mysql_link = NULL; - int id = -1; + size_t db_len; php_mysql_conn *mysql; + zval *mysql_link = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &db, &db_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|r", &db, &db_len, &mysql_link) == FAILURE) { return; } if (!mysql_link) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - PHPMY_UNBUFFERED_QUERY_CHECK(); if (mysql_create_db(mysql->conn, db)==0) { @@ -1414,23 +1461,25 @@ PHP_FUNCTION(mysql_create_db) PHP_FUNCTION(mysql_drop_db) { char *db; - int db_len; - zval *mysql_link = NULL; - int id = -1; + size_t db_len; php_mysql_conn *mysql; + zval *mysql_link = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &db, &db_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|r", &db, &db_len, &mysql_link) == FAILURE) { return; } if (!mysql_link) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - - if (mysql_drop_db(mysql->conn, db)==0) { + if (mysql_drop_db(mysql->conn, db) == 0) { RETURN_TRUE; } else { RETURN_FALSE; @@ -1442,15 +1491,12 @@ PHP_FUNCTION(mysql_drop_db) /* {{{ php_mysql_do_query_general */ -static void php_mysql_do_query_general(char *query, int query_len, zval *mysql_link, int link_id, char *db, int use_store, zval *return_value TSRMLS_DC) +static void php_mysql_do_query_general(php_mysql_conn *mysql, char *query, int query_len, char *db, int use_store, zval *return_value) { - php_mysql_conn *mysql; MYSQL_RES *mysql_result; - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, link_id, "MySQL-Link", le_link, le_plink); - if (db) { - if (!php_mysql_select_db(mysql, db TSRMLS_CC)) { + if (!php_mysql_select_db(mysql, db)) { RETURN_FALSE; } } @@ -1466,20 +1512,20 @@ static void php_mysql_do_query_general(char *query, int query_len, zval *mysql_l MYSQL_ROW row; char *newquery; - int newql = spprintf (&newquery, 0, "EXPLAIN %s", query); + int newql = spprintf(&newquery, 0, "EXPLAIN %s", query); mysql_real_query(mysql->conn, newquery, newql); efree (newquery); if (mysql_errno(mysql->conn)) { - php_error_docref("http://www.mysql.com/doc" TSRMLS_CC, E_WARNING, "%s", mysql_error(mysql->conn)); + php_error_docref("http://www.mysql.com/doc", E_WARNING, "%s", mysql_error(mysql->conn)); RETURN_FALSE; } else { mysql_result = mysql_use_result(mysql->conn); while ((row = mysql_fetch_row(mysql_result))) { if (!strcmp("ALL", row[1])) { - php_error_docref("http://www.mysql.com/doc" TSRMLS_CC, E_WARNING, "Your query requires a full tablescan (table %s, %s rows affected). Use EXPLAIN to optimize your query.", row[0], row[6]); + php_error_docref("http://www.mysql.com/doc", E_WARNING, "Your query requires a full tablescan (table %s, %s rows affected). Use EXPLAIN to optimize your query.", row[0], row[6]); } else if (!strcmp("INDEX", row[1])) { - php_error_docref("http://www.mysql.com/doc" TSRMLS_CC, E_WARNING, "Your query requires a full indexscan (table %s, %s rows affected). Use EXPLAIN to optimize your query.", row[0], row[6]); + php_error_docref("http://www.mysql.com/doc", E_WARNING, "Your query requires a full indexscan (table %s, %s rows affected). Use EXPLAIN to optimize your query.", row[0], row[6]); } } mysql_free_result(mysql_result); @@ -1494,7 +1540,7 @@ static void php_mysql_do_query_general(char *query, int query_len, zval *mysql_l /* check possible error */ if (MySG(trace_mode)){ if (mysql_errno(mysql->conn)){ - php_error_docref("http://www.mysql.com/doc" TSRMLS_CC, E_WARNING, "%s", mysql_error(mysql->conn)); + php_error_docref("http://www.mysql.com/doc", E_WARNING, "%s", mysql_error(mysql->conn)); } } RETURN_FALSE; @@ -1504,29 +1550,31 @@ static void php_mysql_do_query_general(char *query, int query_len, zval *mysql_l /* check possible error */ if (MySG(trace_mode)){ if (mysql_errno(mysql->conn)){ - php_error_docref("http://www.mysql.com/doc" TSRMLS_CC, E_WARNING, "%s", mysql_error(mysql->conn)); + php_error_docref("http://www.mysql.com/doc", E_WARNING, "%s", mysql_error(mysql->conn)); } } RETURN_FALSE; } #endif if(use_store == MYSQL_USE_RESULT) { - mysql_result=mysql_use_result(mysql->conn); + mysql_result = mysql_use_result(mysql->conn); } else { - mysql_result=mysql_store_result(mysql->conn); + mysql_result = mysql_store_result(mysql->conn); } if (!mysql_result) { if (PHP_MYSQL_VALID_RESULT(mysql->conn)) { /* query should have returned rows */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to save result set"); + php_error_docref(NULL, E_WARNING, "Unable to save result set"); RETURN_FALSE; } else { RETURN_TRUE; } } MySG(result_allocated)++; - ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result); + ZVAL_RES(return_value, zend_register_resource(mysql_result, le_result)); + if (use_store == MYSQL_USE_RESULT) { - mysql->active_result_id = Z_LVAL_P(return_value); + mysql->active_result_res = Z_RES_P(return_value); + Z_ADDREF_P(return_value); } } /* }}} */ @@ -1536,20 +1584,25 @@ static void php_mysql_do_query_general(char *query, int query_len, zval *mysql_l static void php_mysql_do_query(INTERNAL_FUNCTION_PARAMETERS, int use_store) { char *query; - int query_len; + size_t query_len; zval *mysql_link = NULL; - int id = -1; + php_mysql_conn *mysql; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &query, &query_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|r", &query, &query_len, &mysql_link) == FAILURE) { return; } if (!mysql_link) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - php_mysql_do_query_general(query, query_len, mysql_link, id, NULL, use_store, return_value TSRMLS_CC); + php_mysql_do_query_general(mysql, query, query_len, NULL, use_store, return_value); } /* }}} */ @@ -1561,7 +1614,6 @@ PHP_FUNCTION(mysql_query) } /* }}} */ - /* {{{ proto resource mysql_unbuffered_query(string query [, int link_identifier]) Sends an SQL query to MySQL, without fetching and buffering the result rows */ PHP_FUNCTION(mysql_unbuffered_query) @@ -1570,138 +1622,146 @@ PHP_FUNCTION(mysql_unbuffered_query) } /* }}} */ - /* {{{ proto resource mysql_db_query(string database_name, string query [, int link_identifier]) Sends an SQL query to MySQL */ PHP_FUNCTION(mysql_db_query) { char *db, *query; - int db_len, query_len; + size_t db_len, query_len; + php_mysql_conn *mysql; zval *mysql_link = NULL; - int id = -1; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|r", &db, &db_len, &query, &query_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|r", &db, &db_len, &query, &query_len, &mysql_link) == FAILURE) { return; } if (!mysql_link) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "This function is deprecated; use mysql_query() instead"); + php_error_docref(NULL, E_DEPRECATED, "This function is deprecated; use mysql_query() instead"); - php_mysql_do_query_general(query, query_len, mysql_link, id, db, MYSQL_STORE_RESULT, return_value TSRMLS_CC); + php_mysql_do_query_general(mysql, query, query_len, db, MYSQL_STORE_RESULT, return_value); } /* }}} */ - /* {{{ proto resource mysql_list_dbs([int link_identifier]) List databases available on a MySQL server */ PHP_FUNCTION(mysql_list_dbs) { - zval *mysql_link = NULL; - int id = -1; php_mysql_conn *mysql; MYSQL_RES *mysql_result; + zval *mysql_link = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &mysql_link) == FAILURE) { return; } if (!mysql_link) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "This function is deprecated; use mysql_query() with SHOW DATABASES instead"); - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); + php_error_docref(NULL, E_DEPRECATED, "This function is deprecated; use mysql_query() with SHOW DATABASES instead"); PHPMY_UNBUFFERED_QUERY_CHECK(); - - if ((mysql_result=mysql_list_dbs(mysql->conn, NULL))==NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to save MySQL query result"); + if ((mysql_result = mysql_list_dbs(mysql->conn, NULL))==NULL) { + php_error_docref(NULL, E_WARNING, "Unable to save MySQL query result"); RETURN_FALSE; } + MySG(result_allocated)++; - ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result); + ZVAL_RES(return_value, zend_register_resource(mysql_result, le_result)); } /* }}} */ - /* {{{ proto resource mysql_list_tables(string database_name [, int link_identifier]) List tables in a MySQL database */ PHP_FUNCTION(mysql_list_tables) { char *db; - int db_len; - zval *mysql_link = NULL; - int id = -1; + size_t db_len; php_mysql_conn *mysql; + zval *mysql_link = NULL; MYSQL_RES *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &db, &db_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|r", &db, &db_len, &mysql_link) == FAILURE) { return; } if (!mysql_link) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - - if (!php_mysql_select_db(mysql, db TSRMLS_CC)) { + if (!php_mysql_select_db(mysql, db)) { RETURN_FALSE; } PHPMY_UNBUFFERED_QUERY_CHECK(); - if ((mysql_result=mysql_list_tables(mysql->conn, NULL))==NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to save MySQL query result"); + if ((mysql_result = mysql_list_tables(mysql->conn, NULL))==NULL) { + php_error_docref(NULL, E_WARNING, "Unable to save MySQL query result"); RETURN_FALSE; } MySG(result_allocated)++; - ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result); + ZVAL_RES(return_value, zend_register_resource(mysql_result, le_result)); } /* }}} */ - /* {{{ proto resource mysql_list_fields(string database_name, string table_name [, int link_identifier]) List MySQL result fields */ PHP_FUNCTION(mysql_list_fields) { char *db, *table; - int db_len, table_len; + size_t db_len, table_len; zval *mysql_link = NULL; - int id = -1; php_mysql_conn *mysql; MYSQL_RES *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|r", &db, &db_len, &table, &table_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|r", &db, &db_len, &table, &table_len, &mysql_link) == FAILURE) { return; } if (!mysql_link) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - - if (!php_mysql_select_db(mysql, db TSRMLS_CC)) { + if (!php_mysql_select_db(mysql, db)) { RETURN_FALSE; } PHPMY_UNBUFFERED_QUERY_CHECK(); if ((mysql_result=mysql_list_fields(mysql->conn, table, NULL))==NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to save MySQL query result"); + php_error_docref(NULL, E_WARNING, "Unable to save MySQL query result"); RETURN_FALSE; } MySG(result_allocated)++; - ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result); + ZVAL_RES(return_value, zend_register_resource(mysql_result, le_result)); } /* }}} */ @@ -1709,132 +1769,134 @@ PHP_FUNCTION(mysql_list_fields) Returns a result set describing the current server threads */ PHP_FUNCTION(mysql_list_processes) { - zval *mysql_link = NULL; - int id = -1; php_mysql_conn *mysql; + zval *mysql_link = NULL; MYSQL_RES *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &mysql_link) == FAILURE) { return; } - if (ZEND_NUM_ARGS() == 0) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + if (!mysql_link) { + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - PHPMY_UNBUFFERED_QUERY_CHECK(); mysql_result = mysql_list_processes(mysql->conn); if (mysql_result == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to save MySQL query result"); + php_error_docref(NULL, E_WARNING, "Unable to save MySQL query result"); RETURN_FALSE; } MySG(result_allocated)++; - ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result); + ZVAL_RES(return_value, zend_register_resource(mysql_result, le_result)); } /* }}} */ - /* {{{ proto string mysql_error([int link_identifier]) Returns the text of the error message from previous MySQL operation */ PHP_FUNCTION(mysql_error) { - zval *mysql_link = NULL; - int id = -1; php_mysql_conn *mysql; + zval *mysql_link = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &mysql_link) == FAILURE) { return; } if (!mysql_link) { - id = MySG(default_link); - if (id==-1) { - if (MySG(connect_error)!=NULL){ - RETURN_STRING(MySG(connect_error),1); + if (MySG(default_link) == NULL) { + if (MySG(connect_error) != NULL){ + RETURN_STRING(MySG(connect_error)); } else { RETURN_FALSE; } } + mysql = (php_mysql_conn*)MySG(default_link)->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - - RETURN_STRING((char *)mysql_error(mysql->conn), 1); + RETURN_STRING((char *)mysql_error(mysql->conn)); } /* }}} */ - /* {{{ proto int mysql_errno([int link_identifier]) Returns the number of the error message from previous MySQL operation */ #ifdef HAVE_MYSQL_ERRNO PHP_FUNCTION(mysql_errno) { - zval *mysql_link = NULL; - int id = -1; php_mysql_conn *mysql; + zval *mysql_link = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &mysql_link) == FAILURE) { return; } if (!mysql_link) { - id = MySG(default_link); - if (id==-1) { - if (MySG(connect_errno)!=0){ + if (MySG(default_link) == NULL) { + if (MySG(connect_error) != NULL){ RETURN_LONG(MySG(connect_errno)); } else { RETURN_FALSE; } } + mysql = (php_mysql_conn*)MySG(default_link)->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - RETURN_LONG(mysql_errno(mysql->conn)); } #endif /* }}} */ - /* {{{ proto int mysql_affected_rows([int link_identifier]) Gets number of affected rows in previous MySQL operation */ PHP_FUNCTION(mysql_affected_rows) { - zval *mysql_link = NULL; - int id = -1; php_mysql_conn *mysql; + zval *mysql_link = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &mysql_link) == FAILURE) { return; } if (!mysql_link) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - /* conversion from int64 to long happing here */ - Z_LVAL_P(return_value) = (long) mysql_affected_rows(mysql->conn); - Z_TYPE_P(return_value) = IS_LONG; + RETURN_LONG((zend_long)mysql_affected_rows(mysql->conn)); } /* }}} */ - /* {{{ proto string mysql_escape_string(string to_be_escaped) Escape string for mysql query */ PHP_FUNCTION(mysql_escape_string) { char *str; - int str_len; + size_t str_len; + zend_string *escaped_str; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &str, &str_len) == FAILURE) { return; } @@ -1842,12 +1904,11 @@ PHP_FUNCTION(mysql_escape_string) * we don't realloc() down to the real size since it'd most probably not * be worth it */ + escaped_str = zend_string_alloc(str_len * 2, 0); + escaped_str->len = mysql_escape_string(escaped_str->val, str, str_len); - Z_STRVAL_P(return_value) = (char *) safe_emalloc(str_len, 2, 1); - Z_STRLEN_P(return_value) = mysql_escape_string(Z_STRVAL_P(return_value), str, str_len); - Z_TYPE_P(return_value) = IS_STRING; - - php_error_docref("function.mysql-real-escape-string" TSRMLS_CC, E_DEPRECATED, "This function is deprecated; use mysql_real_escape_string() instead."); + php_error_docref("function.mysql-real-escape-string", E_DEPRECATED, "This function is deprecated; use mysql_real_escape_string() instead."); + RETURN_STR(escaped_str); } /* }}} */ @@ -1855,29 +1916,34 @@ PHP_FUNCTION(mysql_escape_string) Escape special characters in a string for use in a SQL statement, taking into account the current charset of the connection */ PHP_FUNCTION(mysql_real_escape_string) { - zval *mysql_link = NULL; char *str; - char *new_str; - int id = -1, str_len, new_str_len; + size_t str_len; + zend_string *new_str; php_mysql_conn *mysql; + zval *mysql_link = NULL; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &str, &str_len, &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|r", &str, &str_len, &mysql_link) == FAILURE) { return; } - if (ZEND_NUM_ARGS() == 1) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + if (!mysql_link) { + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - - new_str = safe_emalloc(str_len, 2, 1); - new_str_len = mysql_real_escape_string(mysql->conn, new_str, str, str_len); - new_str = erealloc(new_str, new_str_len + 1); + /* assume worst case situation, which is 2x of the original string. + * we don't realloc() down to the real size since it'd most probably not + * be worth it + */ + new_str = zend_string_alloc(str_len * 2, 0); + new_str->len = mysql_real_escape_string(mysql->conn, new_str->val, str, str_len); - RETURN_STRINGL(new_str, new_str_len, 0); + RETURN_NEW_STR(new_str); } /* }}} */ @@ -1885,34 +1951,34 @@ PHP_FUNCTION(mysql_real_escape_string) Gets the ID generated from the previous INSERT operation */ PHP_FUNCTION(mysql_insert_id) { - zval *mysql_link = NULL; - int id = -1; php_mysql_conn *mysql; + zval *mysql_link = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &mysql_link) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &mysql_link) == FAILURE) { return; } if (!mysql_link) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); - /* conversion from int64 to long happing here */ - Z_LVAL_P(return_value) = (long) mysql_insert_id(mysql->conn); - Z_TYPE_P(return_value) = IS_LONG; + RETURN_LONG((zend_long)mysql_insert_id(mysql->conn)); } /* }}} */ - /* {{{ proto mixed mysql_result(resource result, int row [, mixed field]) Gets result data */ PHP_FUNCTION(mysql_result) { zval *result, *field=NULL; - long row; + zend_long row; MYSQL_RES *mysql_result; #ifndef MYSQL_USE_MYSQLND MYSQL_ROW sql_row; @@ -1925,43 +1991,47 @@ johannes TODO: Do 2 zend_parse_parameters calls instead of type "z" and switch below Q: String or long first? */ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z", &result, &row, &field) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl|z", &result, &row, &field) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); + if ((mysql_result = (MYSQL_RES*)zend_fetch_resource(Z_RES_P(result), "MySQL result", le_result)) == NULL) { + RETURN_FALSE; + } - if (row<0 || row>=(int)mysql_num_rows(mysql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to jump to row %ld on MySQL result index %ld", row, Z_LVAL_P(result)); + if (row < 0 || row >= (int)mysql_num_rows(mysql_result)) { + php_error_docref(NULL, E_WARNING, "Unable to jump to row %pd on MySQL result index %d", row, Z_RES_P(result)->handle); RETURN_FALSE; } mysql_data_seek(mysql_result, row); if (field) { - switch(Z_TYPE_P(field)) { + switch (Z_TYPE_P(field)) { case IS_STRING: { - int i=0; + int i = 0; const MYSQL_FIELD *tmp_field; char *table_name, *field_name, *tmp; - if ((tmp=strchr(Z_STRVAL_P(field), '.'))) { + if ((tmp = strchr(Z_STRVAL_P(field), '.'))) { table_name = estrndup(Z_STRVAL_P(field), tmp-Z_STRVAL_P(field)); - field_name = estrdup(tmp+1); + field_name = estrdup(tmp + 1); } else { table_name = NULL; field_name = estrndup(Z_STRVAL_P(field),Z_STRLEN_P(field)); } mysql_field_seek(mysql_result, 0); - while ((tmp_field=mysql_fetch_field(mysql_result))) { - if ((!table_name || !strcasecmp(tmp_field->table, table_name)) && !strcasecmp(tmp_field->name, field_name)) { + while ((tmp_field = mysql_fetch_field(mysql_result))) { + if ((!table_name || + !strncasecmp(tmp_field->table, table_name, tmp_field->table_length)) && + !strncasecmp(tmp_field->name, field_name, tmp_field->name_length)) { field_offset = i; break; } i++; } if (!tmp_field) { /* no match found */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s%s%s not found in MySQL result index %ld", - (table_name?table_name:""), (table_name?".":""), field_name, Z_LVAL_P(result)); + php_error_docref(NULL, E_WARNING, "%s%s%s not found in MySQL result index %d", + (table_name?table_name:""), (table_name?".":""), field_name, Z_RES_P(result)->handle); efree(field_name); if (table_name) { efree(table_name); @@ -1975,10 +2045,10 @@ Q: String or long first? } break; default: - convert_to_long_ex(&field); + convert_to_long_ex(field); field_offset = Z_LVAL_P(field); - if (field_offset<0 || field_offset>=(int)mysql_num_fields(mysql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad column offset specified"); + if (field_offset < 0 || field_offset >= (int)mysql_num_fields(mysql_result)) { + php_error_docref(NULL, E_WARNING, "Bad column offset specified"); RETURN_FALSE; } break; @@ -1986,25 +2056,14 @@ Q: String or long first? } #ifndef MYSQL_USE_MYSQLND - if ((sql_row=mysql_fetch_row(mysql_result))==NULL - || (sql_row_lengths=mysql_fetch_lengths(mysql_result))==NULL) { /* shouldn't happen? */ + if ((sql_row = mysql_fetch_row(mysql_result)) == NULL + || (sql_row_lengths=mysql_fetch_lengths(mysql_result)) == NULL) { /* shouldn't happen? */ RETURN_FALSE; } if (sql_row[field_offset]) { - Z_TYPE_P(return_value) = IS_STRING; - -#if PHP_API_VERSION < 20100412 - if (PG(magic_quotes_runtime)) { - Z_STRVAL_P(return_value) = php_addslashes(sql_row[field_offset], sql_row_lengths[field_offset],&Z_STRLEN_P(return_value), 0 TSRMLS_CC); - } else { -#endif - Z_STRLEN_P(return_value) = sql_row_lengths[field_offset]; - Z_STRVAL_P(return_value) = (char *) safe_estrndup(sql_row[field_offset], Z_STRLEN_P(return_value)); -#if PHP_API_VERSION < 20100412 - } -#endif + RETVAL_STRINGL(sql_row[field_offset], sql_row_lengths[field_offset]); } else { - Z_TYPE_P(return_value) = IS_NULL; + RETURN_NULL(); } #else mysqlnd_result_fetch_field_data(mysql_result, field_offset, return_value); @@ -2012,7 +2071,6 @@ Q: String or long first? } /* }}} */ - /* {{{ proto int mysql_num_rows(resource result) Gets number of rows in a result */ PHP_FUNCTION(mysql_num_rows) @@ -2020,15 +2078,16 @@ PHP_FUNCTION(mysql_num_rows) zval *result; MYSQL_RES *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &result) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &result) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); + if ((mysql_result = (MYSQL_RES*)zend_fetch_resource(Z_RES_P(result), "MySQL result", le_result)) == NULL) { + RETURN_FALSE; + } /* conversion from int64 to long happing here */ - Z_LVAL_P(return_value) = (long) mysql_num_rows(mysql_result); - Z_TYPE_P(return_value) = IS_LONG; + RETURN_LONG((zend_long) mysql_num_rows(mysql_result)); } /* }}} */ @@ -2039,23 +2098,24 @@ PHP_FUNCTION(mysql_num_fields) zval *result; MYSQL_RES *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &result) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &result) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); + if ((mysql_result = (MYSQL_RES*)zend_fetch_resource(Z_RES_P(result), "MySQL result", le_result)) == NULL) { + RETURN_FALSE; + } - Z_LVAL_P(return_value) = mysql_num_fields(mysql_result); - Z_TYPE_P(return_value) = IS_LONG; + RETURN_LONG(mysql_num_fields(mysql_result)); } /* }}} */ /* {{{ php_mysql_fetch_hash */ -static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, int expected_args, int into_object) +static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_type, int expected_args, int into_object) { MYSQL_RES *mysql_result; - zval *res, *ctor_params = NULL; + zval *res, *ctor_params = NULL; zend_class_entry *ce = NULL; #ifndef MYSQL_USE_MYSQLND int i; @@ -2064,31 +2124,44 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, mysql_row_length_type *mysql_row_lengths; #endif -#ifdef ZEND_ENGINE_2 if (into_object) { - char *class_name = NULL; - int class_name_len = 0; + zend_string *class_name = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|sz", &res, &class_name, &class_name_len, &ctor_params) == FAILURE) { +#ifndef FAST_ZPP + if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|Sz", &res, &class_name, &ctor_params) == FAILURE) { return; } +#else + ZEND_PARSE_PARAMETERS_START(1, 3) + Z_PARAM_ZVAL(res) + Z_PARAM_OPTIONAL + Z_PARAM_STR(class_name) + Z_PARAM_ZVAL(ctor_params) + ZEND_PARSE_PARAMETERS_END(); +#endif if (ZEND_NUM_ARGS() < 2) { ce = zend_standard_class_def; } else { - ce = zend_fetch_class(class_name, class_name_len, ZEND_FETCH_CLASS_AUTO TSRMLS_CC); + ce = zend_fetch_class(class_name, ZEND_FETCH_CLASS_AUTO); } if (!ce) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not find class '%s'", class_name); + php_error_docref(NULL, E_WARNING, "Could not find class '%s'", class_name->val); return; } result_type = MYSQL_ASSOC; - } else -#endif - { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &res, &result_type) == FAILURE) { + } else { +#ifndef FAST_ZPP + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &res, &result_type) == FAILURE) { return; } +#else + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_RESOURCE(res) + Z_PARAM_OPTIONAL + Z_PARAM_LONG(result_type) + ZEND_PARSE_PARAMETERS_END(); +#endif if (!result_type) { /* result_type might have been set outside, so only overwrite when not set */ result_type = MYSQL_BOTH; @@ -2096,11 +2169,13 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, } if (result_type & ~MYSQL_BOTH) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The result type should be either MYSQL_NUM, MYSQL_ASSOC or MYSQL_BOTH"); + php_error_docref(NULL, E_WARNING, "The result type should be either MYSQL_NUM, MYSQL_ASSOC or MYSQL_BOTH"); result_type = MYSQL_BOTH; } - ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &res, -1, "MySQL result", le_result); + if ((mysql_result = (MYSQL_RES*)zend_fetch_resource_ex(res, "MySQL result", le_result)) == NULL) { + RETURN_FALSE; + } #ifndef MYSQL_USE_MYSQLND if ((mysql_row = mysql_fetch_row(mysql_result)) == NULL || @@ -2116,29 +2191,18 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, mysql_field = mysql_fetch_field(mysql_result), i++) { if (mysql_row[i]) { - zval *data; - - MAKE_STD_ZVAL(data); + zval data; -#if PHP_API_VERSION < 20100412 - if (PG(magic_quotes_runtime)) { - Z_TYPE_P(data) = IS_STRING; - Z_STRVAL_P(data) = php_addslashes(mysql_row[i], mysql_row_lengths[i], &Z_STRLEN_P(data), 0 TSRMLS_CC); - } else { -#endif - ZVAL_STRINGL(data, mysql_row[i], mysql_row_lengths[i], 1); -#if PHP_API_VERSION < 20100412 - } -#endif + ZVAL_STRINGL(&data, mysql_row[i], mysql_row_lengths[i]); if (result_type & MYSQL_NUM) { - add_index_zval(return_value, i, data); + add_index_zval(return_value, i, &data); } if (result_type & MYSQL_ASSOC) { if (result_type & MYSQL_NUM) { - Z_ADDREF_P(data); + Z_ADDREF_P(&data); } - add_assoc_zval(return_value, mysql_field->name, data); + add_assoc_zval(return_value, mysql_field->name, &data); } } else { /* NULL value. */ @@ -2155,37 +2219,44 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, mysqlnd_fetch_into(mysql_result, ((result_type & MYSQL_NUM)? MYSQLND_FETCH_NUM:0) | ((result_type & MYSQL_ASSOC)? MYSQLND_FETCH_ASSOC:0), return_value, MYSQLND_MYSQL); #endif -#ifdef ZEND_ENGINE_2 /* mysqlnd might return FALSE if no more rows */ - if (into_object && Z_TYPE_P(return_value) != IS_BOOL) { - zval dataset = *return_value; + if (into_object && Z_TYPE_P(return_value) != IS_FALSE) { + zval dataset; zend_fcall_info fci; zend_fcall_info_cache fcc; - zval *retval_ptr; + zval retval; + ZVAL_COPY_VALUE(&dataset, return_value); object_and_properties_init(return_value, ce, NULL); - zend_merge_properties(return_value, Z_ARRVAL(dataset), 1 TSRMLS_CC); + if (!ce->default_properties_count && !ce->__set) { + ALLOC_HASHTABLE(Z_OBJ_P(return_value)->properties); + *Z_OBJ_P(return_value)->properties = *Z_ARRVAL(dataset); + efree(Z_ARR(dataset)); + } else { + zend_merge_properties(return_value, Z_ARRVAL(dataset)); + zval_dtor(&dataset); + } if (ce->constructor) { fci.size = sizeof(fci); fci.function_table = &ce->function_table; - fci.function_name = NULL; + ZVAL_UNDEF(&fci.function_name); fci.symbol_table = NULL; - fci.object_ptr = return_value; - fci.retval_ptr_ptr = &retval_ptr; + fci.object = Z_OBJ_P(return_value); + fci.retval = &retval; fci.params = NULL; fci.param_count = 0; fci.no_separation = 1; if (ctor_params && Z_TYPE_P(ctor_params) != IS_NULL) { - if (zend_fcall_info_args(&fci, ctor_params TSRMLS_CC) == FAILURE) { + if (zend_fcall_info_args(&fci, ctor_params) == FAILURE) { /* Two problems why we throw exceptions here: PHP is typeless * and hence passing one argument that's not an array could be * by mistake and the other way round is possible, too. The * single value is an array. Also we'd have to make that one * argument passed by reference. */ - zend_throw_exception(zend_exception_get_default(TSRMLS_C), "Parameter ctor_params must be an array", 0 TSRMLS_CC); + zend_throw_exception(zend_exception_get_default(), "Parameter ctor_params must be an array", 0); return; } } @@ -2194,23 +2265,22 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, fcc.function_handler = ce->constructor; fcc.calling_scope = EG(scope); fcc.called_scope = Z_OBJCE_P(return_value); - fcc.object_ptr = return_value; + fcc.object = Z_OBJ_P(return_value); - if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) { - zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "Could not execute %s::%s()", ce->name, ce->constructor->common.function_name); + if (zend_call_function(&fci, &fcc) == FAILURE) { + zend_throw_exception_ex(zend_exception_get_default(), 0, "Could not execute %s::%s()", ce->name->val, ce->constructor->common.function_name->val); } else { - if (retval_ptr) { - zval_ptr_dtor(&retval_ptr); + if (!Z_ISUNDEF(retval)) { + zval_ptr_dtor(&retval); } } if (fci.params) { efree(fci.params); } } else if (ctor_params) { - zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "Class %s does not have a constructor hence you cannot use ctor_params", ce->name); + zend_throw_exception_ex(zend_exception_get_default(), 0, "Class %s does not have a constructor hence you cannot use ctor_params", ce->name->val); } } -#endif } /* }}} */ @@ -2223,7 +2293,6 @@ PHP_FUNCTION(mysql_fetch_row) } /* }}} */ - /* {{{ proto object mysql_fetch_object(resource result [, string class_name [, NULL|array ctor_params]]) Fetch a result row as an object */ PHP_FUNCTION(mysql_fetch_object) @@ -2236,7 +2305,6 @@ PHP_FUNCTION(mysql_fetch_object) } /* }}} */ - /* {{{ proto array mysql_fetch_array(resource result [, int result_type]) Fetch a result row as an array (associative, numeric or both) */ PHP_FUNCTION(mysql_fetch_array) @@ -2245,7 +2313,6 @@ PHP_FUNCTION(mysql_fetch_array) } /* }}} */ - /* {{{ proto array mysql_fetch_assoc(resource result) Fetch a result row as an associative array */ PHP_FUNCTION(mysql_fetch_assoc) @@ -2259,17 +2326,19 @@ PHP_FUNCTION(mysql_fetch_assoc) PHP_FUNCTION(mysql_data_seek) { zval *result; - long offset; + zend_long offset; MYSQL_RES *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &result, &offset)) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &result, &offset)) { return; } - ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); + if ((mysql_result = zend_fetch_resource(Z_RES_P(result), "MySQL result", le_result)) == NULL) { + RETURN_FALSE; + } - if (offset<0 || offset>=(int)mysql_num_rows(mysql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset %ld is invalid for MySQL result index %ld (or the query data is unbuffered)", offset, Z_LVAL_P(result)); + if (offset < 0 || offset >= (int)mysql_num_rows(mysql_result)) { + php_error_docref(NULL, E_WARNING, "Offset %pd is invalid for MySQL result index %d (or the query data is unbuffered)", offset, Z_RES_P(result)->handle); RETURN_FALSE; } mysql_data_seek(mysql_result, offset); @@ -2277,7 +2346,6 @@ PHP_FUNCTION(mysql_data_seek) } /* }}} */ - /* {{{ proto array mysql_fetch_lengths(resource result) Gets max data size of each column in a result */ PHP_FUNCTION(mysql_fetch_lengths) @@ -2288,11 +2356,13 @@ PHP_FUNCTION(mysql_fetch_lengths) int num_fields; int i; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &result) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &result) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); + if ((mysql_result = (MYSQL_RES *)zend_fetch_resource(Z_RES_P(result), "MySQL result", le_result)) == NULL) { + RETURN_FALSE; + } if ((lengths=mysql_fetch_lengths(mysql_result))==NULL) { RETURN_FALSE; @@ -2387,60 +2457,68 @@ static char *php_mysql_get_field_name(int field_type) PHP_FUNCTION(mysql_fetch_field) { zval *result; - long field=0; + zend_long field=0; MYSQL_RES *mysql_result; const MYSQL_FIELD *mysql_field; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &result, &field) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &result, &field) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); + if ((mysql_result = (MYSQL_RES *)zend_fetch_resource(Z_RES_P(result), "MySQL result", le_result)) == NULL) { + RETURN_FALSE; + } if (ZEND_NUM_ARGS() > 1) { - if (field<0 || field>=(int)mysql_num_fields(mysql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad field offset"); + if (field<0 || field >= (int)mysql_num_fields(mysql_result)) { + php_error_docref(NULL, E_WARNING, "Bad field offset"); RETURN_FALSE; } mysql_field_seek(mysql_result, field); } - if ((mysql_field=mysql_fetch_field(mysql_result))==NULL) { + if ((mysql_field = mysql_fetch_field(mysql_result)) == NULL) { RETURN_FALSE; } object_init(return_value); - add_property_string(return_value, "name",(mysql_field->name?mysql_field->name:""), 1); - add_property_string(return_value, "table",(mysql_field->table?mysql_field->table:""), 1); - add_property_string(return_value, "def",(mysql_field->def?mysql_field->def:""), 1); +#if MYSQL_USE_MYSQLND + add_property_str(return_value, "name", zend_string_copy(mysql_field->sname)); +#else + add_property_stringl(return_value, "name", (mysql_field->name?mysql_field->name:""), mysql_field->name_length); +#endif + add_property_stringl(return_value, "table", (mysql_field->table?mysql_field->table:""), mysql_field->table_length); + add_property_stringl(return_value, "def", (mysql_field->def?mysql_field->def:""), mysql_field->def_length); add_property_long(return_value, "max_length", mysql_field->max_length); add_property_long(return_value, "not_null", IS_NOT_NULL(mysql_field->flags)?1:0); add_property_long(return_value, "primary_key", IS_PRI_KEY(mysql_field->flags)?1:0); - add_property_long(return_value, "multiple_key",(mysql_field->flags&MULTIPLE_KEY_FLAG?1:0)); - add_property_long(return_value, "unique_key",(mysql_field->flags&UNIQUE_KEY_FLAG?1:0)); - add_property_long(return_value, "numeric", IS_NUM(Z_TYPE_P(mysql_field))?1:0); + add_property_long(return_value, "multiple_key", (mysql_field->flags&MULTIPLE_KEY_FLAG?1:0)); + add_property_long(return_value, "unique_key", (mysql_field->flags&UNIQUE_KEY_FLAG?1:0)); + add_property_long(return_value, "numeric", IS_NUM(mysql_field->type)?1:0); add_property_long(return_value, "blob", IS_BLOB(mysql_field->flags)?1:0); - add_property_string(return_value, "type", php_mysql_get_field_name(Z_TYPE_P(mysql_field)), 1); - add_property_long(return_value, "unsigned",(mysql_field->flags&UNSIGNED_FLAG?1:0)); - add_property_long(return_value, "zerofill",(mysql_field->flags&ZEROFILL_FLAG?1:0)); + add_property_string(return_value, "type", php_mysql_get_field_name(mysql_field->type)); + add_property_long(return_value, "unsigned", (mysql_field->flags&UNSIGNED_FLAG?1:0)); + add_property_long(return_value, "zerofill", (mysql_field->flags&ZEROFILL_FLAG?1:0)); } /* }}} */ - /* {{{ proto bool mysql_field_seek(resource result, int field_offset) Sets result pointer to a specific field offset */ PHP_FUNCTION(mysql_field_seek) { zval *result; - long offset; + zend_long offset; MYSQL_RES *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &result, &offset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &result, &offset) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); - if (offset<0 || offset>=(int)mysql_num_fields(mysql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field %ld is invalid for MySQL result index %ld", offset, Z_LVAL_P(result)); + if ((mysql_result = (MYSQL_RES *)zend_fetch_resource(Z_RES_P(result), "MySQL result", le_result)) == NULL) { + RETURN_FALSE; + } + + if (offset < 0 || offset >= (int)mysql_num_fields(mysql_result)) { + php_error_docref(NULL, E_WARNING, "Field %pd is invalid for MySQL result index %d", offset, Z_RES_P(result)->handle); RETURN_FALSE; } mysql_field_seek(mysql_result, offset); @@ -2448,7 +2526,6 @@ PHP_FUNCTION(mysql_field_seek) } /* }}} */ - #define PHP_MYSQL_FIELD_NAME 1 #define PHP_MYSQL_FIELD_TABLE 2 #define PHP_MYSQL_FIELD_LEN 3 @@ -2460,20 +2537,22 @@ PHP_FUNCTION(mysql_field_seek) static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) { zval *result; - long field; + zend_long field; MYSQL_RES *mysql_result; const MYSQL_FIELD *mysql_field = {0}; char buf[512]; int len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &result, &field) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &result, &field) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); + if ((mysql_result = (MYSQL_RES *)zend_fetch_resource(Z_RES_P(result), "MySQL result", le_result)) == NULL) { + RETURN_FALSE; + } - if (field<0 || field>=(int)mysql_num_fields(mysql_result)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field %ld is invalid for MySQL result index %ld", field, Z_LVAL_P(result)); + if (field < 0 || field >= (int)mysql_num_fields(mysql_result)) { + php_error_docref(NULL, E_WARNING, "Field %pd is invalid for MySQL result index %d", field, Z_RES_P(result)->handle); RETURN_FALSE; } mysql_field_seek(mysql_result, field); @@ -2483,24 +2562,20 @@ static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) switch (entry_type) { case PHP_MYSQL_FIELD_NAME: - Z_STRLEN_P(return_value) = strlen(mysql_field->name); - Z_STRVAL_P(return_value) = estrndup(mysql_field->name, Z_STRLEN_P(return_value)); - Z_TYPE_P(return_value) = IS_STRING; +#ifdef MYSQL_USE_MYSQLND + RETVAL_STR(zend_string_copy(mysql_field->sname)); +#else + RETVAL_STRING(mysql_field->name); +#endif break; case PHP_MYSQL_FIELD_TABLE: - Z_STRLEN_P(return_value) = strlen(mysql_field->table); - Z_STRVAL_P(return_value) = estrndup(mysql_field->table, Z_STRLEN_P(return_value)); - Z_TYPE_P(return_value) = IS_STRING; + RETVAL_STRING(mysql_field->table); break; case PHP_MYSQL_FIELD_LEN: - Z_LVAL_P(return_value) = mysql_field->length; - Z_TYPE_P(return_value) = IS_LONG; + RETVAL_LONG(mysql_field->length); break; case PHP_MYSQL_FIELD_TYPE: - Z_STRVAL_P(return_value) = php_mysql_get_field_name(Z_TYPE_P(mysql_field)); - Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value)); - Z_STRVAL_P(return_value) = estrndup(Z_STRVAL_P(return_value), Z_STRLEN_P(return_value)); - Z_TYPE_P(return_value) = IS_STRING; + RETVAL_STRING(php_mysql_get_field_name(mysql_field->type)); break; case PHP_MYSQL_FIELD_FLAGS: memcpy(buf, "", sizeof("")); @@ -2571,9 +2646,7 @@ static void php_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) len--; } - Z_STRLEN_P(return_value) = len; - Z_STRVAL_P(return_value) = estrndup(buf, len); - Z_TYPE_P(return_value) = IS_STRING; + RETVAL_STRINGL(buf, len); break; default: @@ -2590,7 +2663,6 @@ PHP_FUNCTION(mysql_field_name) } /* }}} */ - /* {{{ proto string mysql_field_table(resource result, int field_offset) Gets name of the table the specified field is in */ PHP_FUNCTION(mysql_field_table) @@ -2599,7 +2671,6 @@ PHP_FUNCTION(mysql_field_table) } /* }}} */ - /* {{{ proto int mysql_field_len(resource result, int field_offset) Returns the length of the specified field */ PHP_FUNCTION(mysql_field_len) @@ -2608,7 +2679,6 @@ PHP_FUNCTION(mysql_field_len) } /* }}} */ - /* {{{ proto string mysql_field_type(resource result, int field_offset) Gets the type of the specified field in a result */ PHP_FUNCTION(mysql_field_type) @@ -2617,7 +2687,6 @@ PHP_FUNCTION(mysql_field_type) } /* }}} */ - /* {{{ proto string mysql_field_flags(resource result, int field_offset) Gets the flags associated with the specified field in a result */ PHP_FUNCTION(mysql_field_flags) @@ -2626,7 +2695,6 @@ PHP_FUNCTION(mysql_field_flags) } /* }}} */ - /* {{{ proto bool mysql_free_result(resource result) Free result memory */ PHP_FUNCTION(mysql_free_result) @@ -2634,17 +2702,15 @@ PHP_FUNCTION(mysql_free_result) zval *result; MYSQL_RES *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &result) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &result) == FAILURE) { return; } - if (Z_LVAL_P(result)==0) { + if ((mysql_result = (MYSQL_RES *)zend_fetch_resource(Z_RES_P(result), "MySQL result", le_result)) == NULL) { RETURN_FALSE; } - ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, &result, -1, "MySQL result", le_result); - - zend_list_delete(Z_LVAL_P(result)); + zend_list_close(Z_RES_P(result)); RETURN_TRUE; } /* }}} */ @@ -2653,22 +2719,26 @@ PHP_FUNCTION(mysql_free_result) Ping a server connection. If no connection then reconnect. */ PHP_FUNCTION(mysql_ping) { - zval *mysql_link = NULL; - int id = -1; php_mysql_conn *mysql; + zval *mysql_link = NULL; - if (0 == ZEND_NUM_ARGS()) { - id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); - CHECK_LINK(id); - } else if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &mysql_link)==FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &mysql_link)==FAILURE) { return; } - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); + if (!mysql_link) { + zend_resource *res = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(res); + mysql = (php_mysql_conn*)res->ptr; + } else { + if (!(mysql = (php_mysql_conn *)zend_fetch_resource2(Z_RES_P(mysql_link), "MySQL-Link", le_link, le_plink))) { + RETURN_FALSE; + } + } PHPMY_UNBUFFERED_QUERY_CHECK(); - RETURN_BOOL(! mysql_ping(mysql->conn)); + RETURN_BOOL(!mysql_ping(mysql->conn)); } /* }}} */ diff --git a/ext/mysql/php_mysql.h b/ext/mysql/php_mysql.h index a6ac768b2e..cffb3cd21d 100644 --- a/ext/mysql/php_mysql.h +++ b/ext/mysql/php_mysql.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2015 The PHP Group | +----------------------------------------------------------------------+ diff --git a/ext/mysql/php_mysql_structs.h b/ext/mysql/php_mysql_structs.h index e0c6ce8af7..59b3b595c9 100644 --- a/ext/mysql/php_mysql_structs.h +++ b/ext/mysql/php_mysql_structs.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2015 The PHP Group | +----------------------------------------------------------------------+ @@ -111,23 +111,26 @@ PHP_FUNCTION(mysql_set_charset); #endif ZEND_BEGIN_MODULE_GLOBALS(mysql) - long default_link; - long num_links,num_persistent; - long max_links,max_persistent; - long allow_persistent; - long default_port; + zend_resource *default_link; + zend_long num_links,num_persistent; + zend_long max_links,max_persistent; + zend_long allow_persistent; + zend_long default_port; char *default_host, *default_user, *default_password; char *default_socket; char *connect_error; - long connect_errno; - long connect_timeout; - long result_allocated; - long trace_mode; - long allow_local_infile; + zend_long connect_errno; + zend_long connect_timeout; + zend_long result_allocated; + zend_long trace_mode; + zend_long allow_local_infile; ZEND_END_MODULE_GLOBALS(mysql) #ifdef ZTS -# define MySG(v) TSRMG(mysql_globals_id, zend_mysql_globals *, v) +# define MySG(v) ZEND_TSRMG(mysql_globals_id, zend_mysql_globals *, v) +# ifdef COMPILE_DL_MYSQL +ZEND_TSRMLS_CACHE_EXTERN; +# endif #else # define MySG(v) (mysql_globals.v) #endif diff --git a/ext/mysql/tests/bug55473.phpt b/ext/mysql/tests/bug55473.phpt index 98fd0091dc..7d149dc6fd 100644 --- a/ext/mysql/tests/bug55473.phpt +++ b/ext/mysql/tests/bug55473.phpt @@ -8,6 +8,9 @@ if (defined('PHP_WINDOWS_VERSION_MAJOR')) { die("skip Test doesn't work on Windows"); } +if (!$IS_MYSQLND) + die("skip mysqlnd only, libmysql does not warning about server gone away"); + if (!($output = @exec("lsof -np " . getmypid()))) die("skip Test can't find command line tool lsof"); ?> diff --git a/ext/mysql/tests/mysql_client_encoding.phpt b/ext/mysql/tests/mysql_client_encoding.phpt index 5b21765ddb..c10303b55a 100644 --- a/ext/mysql/tests/mysql_client_encoding.phpt +++ b/ext/mysql/tests/mysql_client_encoding.phpt @@ -50,7 +50,9 @@ if ($link_enc !== $tmp['charset']) { } } -if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && function_exists('is_unicode')) { +if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && + (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) && + function_exists('is_unicode')) { // unicode mode if (!is_unicode($default_link_enc) || !is_unicode($link_enc)) { printf("[010] No unicode returned!\n"); diff --git a/ext/mysql/tests/mysql_data_seek.phpt b/ext/mysql/tests/mysql_data_seek.phpt index 72d3e63274..268e145842 100644 --- a/ext/mysql/tests/mysql_data_seek.phpt +++ b/ext/mysql/tests/mysql_data_seek.phpt @@ -75,5 +75,5 @@ Warning: mysql_data_seek(): Offset -1 is invalid for MySQL result index %d (or t Warning: mysql_data_seek(): Offset 3 is invalid for MySQL result index %d (or the query data is unbuffered) in %s on line %d -Warning: mysql_data_seek(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_data_seek(): supplied resource is not a valid MySQL result resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_db_name.phpt b/ext/mysql/tests/mysql_db_name.phpt index 92878e994d..ba8334aaff 100644 --- a/ext/mysql/tests/mysql_db_name.phpt +++ b/ext/mysql/tests/mysql_db_name.phpt @@ -34,7 +34,8 @@ if (false !== ($tmp = mysql_db_name($res, $num + 1))) printf("[006] Expecting boolean/false, got %s/%s. [%d] %s\n", gettype($tmp), $tmp, mysql_errno($link), mysql_error($link)); -$unicode = (boolean)(version_compare(PHP_VERSION, '5.9.9', '>') == 1); +$unicode = (boolean)(version_compare(PHP_VERSION, '5.9.9', '>') == 1 && + version_compare(PHP_VERSION, '6.9.9', '<=') == 1); for ($i = 0; $i < $num; $i++) { if ('' === ($dbname = mysql_db_name($res, $i))) printf("[%03d] Got empty database name! [%d] %s\n", @@ -64,5 +65,5 @@ Warning: mysql_db_name(): Unable to jump to row -1 on MySQL result index %d in % Warning: mysql_db_name(): Unable to jump to row %d on MySQL result index %d in %s on line %d -Warning: mysql_db_name(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_db_name(): supplied resource is not a valid MySQL result resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_db_query.phpt b/ext/mysql/tests/mysql_db_query.phpt index 291fbfaac6..dc556f449e 100644 --- a/ext/mysql/tests/mysql_db_query.phpt +++ b/ext/mysql/tests/mysql_db_query.phpt @@ -32,7 +32,9 @@ $row = mysql_fetch_assoc($res); if (1 != $row['id']) printf("[005] Expecting record 1/a, got record %s/%s\n", $row['id'], $row['label']); -if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row['label'])) { +if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && + (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) && + !is_unicode($row['label'])) { printf("[006] No unicode returned! [%d] %s\n", mysql_errno($link), mysql_error($link)); var_inspect($row); } @@ -47,7 +49,9 @@ $row = mysql_fetch_assoc($res); if (1 != $row['id']) printf("[008] Expecting record 1/a, got record %s/%s\n", $row['id'], $row['label']); -if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row['label'])) { +if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && + (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) && + !is_unicode($row['label'])) { printf("[009] No unicode returned! [%d] %s\n", mysql_errno(), mysql_error()); var_inspect($row); } diff --git a/ext/mysql/tests/mysql_deprecated_api.phpt b/ext/mysql/tests/mysql_deprecated_api.phpt index ebf72375cf..8844617c66 100644 --- a/ext/mysql/tests/mysql_deprecated_api.phpt +++ b/ext/mysql/tests/mysql_deprecated_api.phpt @@ -13,7 +13,7 @@ error_reporting=E_ALL | E_NOTICE | E_STRICT /* We use an extra test to cover deprecation warning. Due to this extra test we can silence deprecation warnings - in have other test using @ operator without loosing the information + in have other test using @ operator without losing the information which function is deprecated and, without reducing test portability. */ include "table.inc"; diff --git a/ext/mysql/tests/mysql_errno.phpt b/ext/mysql/tests/mysql_errno.phpt index c9c2956290..83aa7327bd 100644 --- a/ext/mysql/tests/mysql_errno.phpt +++ b/ext/mysql/tests/mysql_errno.phpt @@ -59,6 +59,6 @@ Deprecated: mysql_connect(): The mysql extension is deprecated and will be remov int(0) int(%d) -Warning: mysql_errno(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_errno(): supplied resource is not a valid MySQL-Link resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_error.phpt b/ext/mysql/tests/mysql_error.phpt index a2cf7e0034..9b0729d0c0 100644 --- a/ext/mysql/tests/mysql_error.phpt +++ b/ext/mysql/tests/mysql_error.phpt @@ -39,7 +39,9 @@ $tmp = mysql_error($link); if (!is_string($tmp) || !preg_match("/Table '\w*\.test' doesn't exist/su", $tmp)) printf("[006] Expecting string/[Table... doesn't exit], got %s/%s. [%d] %s\n", gettype($tmp), $tmp, mysql_errno($link), mysql_error($link)); -if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp)) { +if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && + (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) && + !is_unicode($tmp)) { printf("[007] Expecting Unicode error message!\n"); var_inspect($tmp); } @@ -64,6 +66,6 @@ require_once("clean_table.inc"); --EXPECTF-- Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in %s on line %d -Warning: mysql_error(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_error(): supplied resource is not a valid MySQL-Link resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_fetch_array.phpt b/ext/mysql/tests/mysql_fetch_array.phpt index 8ccefd0242..1b1852d932 100644 --- a/ext/mysql/tests/mysql_fetch_array.phpt +++ b/ext/mysql/tests/mysql_fetch_array.phpt @@ -357,5 +357,5 @@ array(11) { Warning: mysql_fetch_array(): The result type should be either MYSQL_NUM, MYSQL_ASSOC or MYSQL_BOTH in %s on line %d -Warning: mysql_fetch_array(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_fetch_array(): supplied resource is not a valid MySQL result resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_fetch_assoc.phpt b/ext/mysql/tests/mysql_fetch_assoc.phpt index 048613a6be..936c7c6f23 100644 --- a/ext/mysql/tests/mysql_fetch_assoc.phpt +++ b/ext/mysql/tests/mysql_fetch_assoc.phpt @@ -87,7 +87,7 @@ array(5) { %unicode|string%(1) "1" } -Warning: mysql_fetch_assoc(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_fetch_assoc(): supplied resource is not a valid MySQL result resource in %s on line %d Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in %s on line %d [010] diff --git a/ext/mysql/tests/mysql_fetch_field.phpt b/ext/mysql/tests/mysql_fetch_field.phpt index 85c1fd6f7e..6855fc52dc 100644 --- a/ext/mysql/tests/mysql_fetch_field.phpt +++ b/ext/mysql/tests/mysql_fetch_field.phpt @@ -217,7 +217,7 @@ bool(false) Warning: mysql_fetch_field(): Bad field offset in %s on line %d -Warning: mysql_fetch_field(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_fetch_field(): supplied resource is not a valid MySQL result resource in %s on line %d object(stdClass)#%d (13) { [%u|b%"name"]=> %unicode|string%(2) "id" diff --git a/ext/mysql/tests/mysql_fetch_lengths.phpt b/ext/mysql/tests/mysql_fetch_lengths.phpt index f0fbbb7bb8..f59833e918 100644 --- a/ext/mysql/tests/mysql_fetch_lengths.phpt +++ b/ext/mysql/tests/mysql_fetch_lengths.phpt @@ -48,6 +48,6 @@ array(2) { } bool(false) -Warning: mysql_fetch_lengths(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_fetch_lengths(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_fetch_object.phpt b/ext/mysql/tests/mysql_fetch_object.phpt index 666d0ee821..5038863458 100644 --- a/ext/mysql/tests/mysql_fetch_object.phpt +++ b/ext/mysql/tests/mysql_fetch_object.phpt @@ -147,7 +147,7 @@ bool(false) bool(false) bool(false) -Warning: mysql_fetch_object(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_fetch_object(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) Fatal error: Class 'this_class_does_not_exist' not found in %s on line %d diff --git a/ext/mysql/tests/mysql_fetch_row.phpt b/ext/mysql/tests/mysql_fetch_row.phpt index 0ed932e2c0..d26f7a4d82 100644 --- a/ext/mysql/tests/mysql_fetch_row.phpt +++ b/ext/mysql/tests/mysql_fetch_row.phpt @@ -52,6 +52,6 @@ array(2) { [005] bool(false) -Warning: mysql_fetch_row(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_fetch_row(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_field_flags.phpt b/ext/mysql/tests/mysql_field_flags.phpt index 5f8eb0995f..bf2a193f57 100644 --- a/ext/mysql/tests/mysql_field_flags.phpt +++ b/ext/mysql/tests/mysql_field_flags.phpt @@ -32,7 +32,9 @@ if (false !== ($tmp = mysql_field_flags($res, -1))) if (!is_string($tmp = mysql_field_flags($res, 0)) || empty($tmp)) printf("[006] Expecting non empty string, got %s/%s\n", gettype($tmp), $tmp); -if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp)) { +if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && + (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) && + !is_unicode($tmp)) { printf("[007] Check the unicode support!\n"); var_inspect($tmp); } @@ -152,6 +154,6 @@ Warning: mysql_field_flags(): Field -1 is invalid for MySQL result index %d in % Warning: mysql_field_flags(): Field 2 is invalid for MySQL result index %d in %s on line %d -Warning: mysql_field_flags(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_field_flags(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_field_len.phpt b/ext/mysql/tests/mysql_field_len.phpt index 119d352164..a7b4cabee3 100644 --- a/ext/mysql/tests/mysql_field_len.phpt +++ b/ext/mysql/tests/mysql_field_len.phpt @@ -55,6 +55,6 @@ Warning: mysql_field_len(): Field -1 is invalid for MySQL result index %d in %s Warning: mysql_field_len(): Field 2 is invalid for MySQL result index %d in %s on line %d -Warning: mysql_field_len(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_field_len(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_field_name.phpt b/ext/mysql/tests/mysql_field_name.phpt index 85f6c42d93..1ef613babe 100644 --- a/ext/mysql/tests/mysql_field_name.phpt +++ b/ext/mysql/tests/mysql_field_name.phpt @@ -55,6 +55,6 @@ Warning: mysql_field_name(): Field -1 is invalid for MySQL result index %d in %s Warning: mysql_field_name(): Field 2 is invalid for MySQL result index %d in %s on line %d -Warning: mysql_field_name(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_field_name(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_field_seek.phpt b/ext/mysql/tests/mysql_field_seek.phpt index 8487493a88..a9eab70bca 100644 --- a/ext/mysql/tests/mysql_field_seek.phpt +++ b/ext/mysql/tests/mysql_field_seek.phpt @@ -139,6 +139,6 @@ Warning: mysql_field_seek(): Field %d is invalid for MySQL result index %d in %s bool(false) bool(false) -Warning: mysql_field_seek(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_field_seek(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_field_table.phpt b/ext/mysql/tests/mysql_field_table.phpt index 826651a855..d95be96ee5 100644 --- a/ext/mysql/tests/mysql_field_table.phpt +++ b/ext/mysql/tests/mysql_field_table.phpt @@ -55,6 +55,6 @@ Warning: mysql_field_table(): Field -1 is invalid for MySQL result index %d in % Warning: mysql_field_table(): Field 2 is invalid for MySQL result index %d in %s on line %d -Warning: mysql_field_table(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_field_table(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_field_type.phpt b/ext/mysql/tests/mysql_field_type.phpt index c767cab6f1..e4b774a691 100644 --- a/ext/mysql/tests/mysql_field_type.phpt +++ b/ext/mysql/tests/mysql_field_type.phpt @@ -55,6 +55,6 @@ Warning: mysql_field_type(): Field -1 is invalid for MySQL result index %d in %s Warning: mysql_field_type(): Field 2 is invalid for MySQL result index %d in %s on line %d -Warning: mysql_field_type(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_field_type(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_free_result.phpt b/ext/mysql/tests/mysql_free_result.phpt index 90498bd59a..582297c80f 100644 --- a/ext/mysql/tests/mysql_free_result.phpt +++ b/ext/mysql/tests/mysql_free_result.phpt @@ -47,6 +47,6 @@ require_once("clean_table.inc"); Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in %s on line %d bool(true) -Warning: mysql_free_result(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_free_result(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_get_client_info.phpt b/ext/mysql/tests/mysql_get_client_info.phpt index 95de0ad5ed..6e84628476 100644 --- a/ext/mysql/tests/mysql_get_client_info.phpt +++ b/ext/mysql/tests/mysql_get_client_info.phpt @@ -8,7 +8,9 @@ include "connect.inc"; if (!is_string($info = mysql_get_client_info()) || ('' === $info)) printf("[001] Expecting string/any_non_empty, got %s/%s\n", gettype($info), $info); -if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($info)) { +if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && + (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) && + !is_unicode($info)) { printf("[002] Expecting Unicode!\n"); var_inspect($info); } diff --git a/ext/mysql/tests/mysql_get_host_info.phpt b/ext/mysql/tests/mysql_get_host_info.phpt index 4b21ddbb41..a98ab5be35 100644 --- a/ext/mysql/tests/mysql_get_host_info.phpt +++ b/ext/mysql/tests/mysql_get_host_info.phpt @@ -25,7 +25,9 @@ if ($def_info !== $info) { var_dump($info); } -if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($info)) { +if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && + (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) && + !is_unicode($info)) { printf("[005] Expecting Unicode error message!\n"); var_inspect($info); } diff --git a/ext/mysql/tests/mysql_get_server_info.phpt b/ext/mysql/tests/mysql_get_server_info.phpt index ad192e4722..e29222b966 100644 --- a/ext/mysql/tests/mysql_get_server_info.phpt +++ b/ext/mysql/tests/mysql_get_server_info.phpt @@ -25,7 +25,9 @@ if ($def_info !== $info) { var_dump($info); } -if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($info)) { +if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && + (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) && + !is_unicode($info)) { printf("[005] Expecting Unicode error message!\n"); var_inspect($info); } diff --git a/ext/mysql/tests/mysql_info.phpt b/ext/mysql/tests/mysql_info.phpt index c478679042..82c680768b 100644 --- a/ext/mysql/tests/mysql_info.phpt +++ b/ext/mysql/tests/mysql_info.phpt @@ -46,7 +46,9 @@ if (!$res = mysql_query("UPDATE test SET label = 'b' WHERE id >= 100", $link)) if (!is_string($tmp = mysql_info($link)) || ('' == $tmp)) printf("[012] Expecting string/any_non_empty, got %s/%s\n", gettype($tmp), $tmp); -if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp)) { +if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && + (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) && + !is_unicode($tmp)) { printf("[013] Expecting Unicode!\n"); var_inspect($info); } diff --git a/ext/mysql/tests/mysql_insert_id.phpt b/ext/mysql/tests/mysql_insert_id.phpt index b69a96ae9b..93319dad23 100644 --- a/ext/mysql/tests/mysql_insert_id.phpt +++ b/ext/mysql/tests/mysql_insert_id.phpt @@ -68,6 +68,6 @@ require_once("clean_table.inc"); --EXPECTF-- Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in %s on line %d -Warning: mysql_insert_id(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_insert_id(): supplied resource is not a valid MySQL-Link resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_list_dbs.phpt b/ext/mysql/tests/mysql_list_dbs.phpt index 402161aa63..559b5a05d9 100644 --- a/ext/mysql/tests/mysql_list_dbs.phpt +++ b/ext/mysql/tests/mysql_list_dbs.phpt @@ -27,7 +27,9 @@ if (!$num = mysql_num_rows($res)) printf("[004] Empty database list? [%d] %s\n", mysql_errno($link), mysql_error($link)); $row = mysql_fetch_array($res, MYSQL_NUM); -if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row[0])) { +if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && + (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) && + !is_unicode($row[0])) { printf("[005] Check for unicode support\n"); var_inspect($row); } diff --git a/ext/mysql/tests/mysql_list_processes.phpt b/ext/mysql/tests/mysql_list_processes.phpt index 7838a6f98a..402a10d995 100644 --- a/ext/mysql/tests/mysql_list_processes.phpt +++ b/ext/mysql/tests/mysql_list_processes.phpt @@ -24,7 +24,9 @@ if (!$num = mysql_num_rows($res)) printf("[003] Empty process list? [%d] %s\n", mysql_errno($link), mysql_error($link)); $row = mysql_fetch_array($res, MYSQL_NUM); -if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row[0])) { +if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && + (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) && + !is_unicode($row[0])) { printf("[004] Check for unicode support\n"); var_inspect($row); } @@ -38,7 +40,9 @@ if (!$num = mysql_num_rows($res)) printf("[006] Empty process list? [%d] %s\n", mysql_errno(), mysql_error()); $row = mysql_fetch_array($res, MYSQL_NUM); -if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($row[0])) { +if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && + (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) && + !is_unicode($row[0])) { printf("[007] Check for unicode support\n"); var_inspect($row); } diff --git a/ext/mysql/tests/mysql_num_fields.phpt b/ext/mysql/tests/mysql_num_fields.phpt index 4621dc91f8..f65f8ec165 100644 --- a/ext/mysql/tests/mysql_num_fields.phpt +++ b/ext/mysql/tests/mysql_num_fields.phpt @@ -54,5 +54,5 @@ require_once("clean_table.inc"); --EXPECTF-- Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in %s on line %d -Warning: mysql_num_fields(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_num_fields(): supplied resource is not a valid MySQL result resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_num_rows.phpt b/ext/mysql/tests/mysql_num_rows.phpt index 5a803d41f9..2b69e939be 100644 --- a/ext/mysql/tests/mysql_num_rows.phpt +++ b/ext/mysql/tests/mysql_num_rows.phpt @@ -85,5 +85,5 @@ Warning: mysql_num_rows() expects parameter 1 to be resource, boolean given in % Warning: mysql_free_result() expects parameter 1 to be resource, boolean given in %s on line %d -Warning: mysql_num_rows(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_num_rows(): supplied resource is not a valid MySQL result resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_ping.phpt b/ext/mysql/tests/mysql_ping.phpt index 0308df3396..2f2c38cd90 100644 --- a/ext/mysql/tests/mysql_ping.phpt +++ b/ext/mysql/tests/mysql_ping.phpt @@ -47,5 +47,5 @@ bool(true) bool(true) bool(true) -Warning: mysql_ping(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_ping(): supplied resource is not a valid MySQL-Link resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_query.phpt b/ext/mysql/tests/mysql_query.phpt index 01b14ee284..abe7adb88c 100644 --- a/ext/mysql/tests/mysql_query.phpt +++ b/ext/mysql/tests/mysql_query.phpt @@ -58,7 +58,9 @@ if (mysql_query('DROP PROCEDURE IF EXISTS p', $link)) { printf("[009] Result seems wrong, dumping\n"); var_dump($tmp); } - if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp['p_version'])) { + if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && + (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) && + !is_unicode($tmp['p_version'])) { printf("[010] Expecting unicode string, dumping\n"); var_dump($tmp); } @@ -75,7 +77,9 @@ if (mysql_query('DROP PROCEDURE IF EXISTS p', $link)) { printf("[012] Result seems wrong, dumping\n"); var_dump($tmp); } - if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp['f_version'])) { + if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && + (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) && + !is_unicode($tmp['f_version'])) { printf("[013] Expecting unicode string, dumping\n"); var_dump($tmp); } @@ -124,5 +128,5 @@ array(1) { } %unicode|string%(1) "a" -Warning: mysql_query(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_query(): supplied resource is not a valid MySQL-Link resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_result.phpt b/ext/mysql/tests/mysql_result.phpt index 0a58b9b883..ae1983fe04 100644 --- a/ext/mysql/tests/mysql_result.phpt +++ b/ext/mysql/tests/mysql_result.phpt @@ -111,6 +111,6 @@ bool(false) Warning: mysql_result(): test.label not found in MySQL result index %d in %s on line %d bool(false) -Warning: mysql_result(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_result(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_select_db.phpt b/ext/mysql/tests/mysql_select_db.phpt index e9bc99aa73..6e0bf9e505 100644 --- a/ext/mysql/tests/mysql_select_db.phpt +++ b/ext/mysql/tests/mysql_select_db.phpt @@ -70,5 +70,5 @@ Deprecated: mysql_connect(): The mysql extension is deprecated and will be remov %unicode|string%(%d) "%s" bool(false) -Warning: mysql_select_db(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_select_db(): supplied resource is not a valid MySQL-Link resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_stat.phpt b/ext/mysql/tests/mysql_stat.phpt index d6a34df581..95868b7b90 100644 --- a/ext/mysql/tests/mysql_stat.phpt +++ b/ext/mysql/tests/mysql_stat.phpt @@ -25,7 +25,9 @@ if ((!is_string($stat = mysql_stat($link))) || ('' === $stat)) printf("[003] Expecting non empty string, got %s/'%s', [%d] %s\n", gettype($stat), $stat, mysql_errno($link), mysql_error($link)); -if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($stat)) { +if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && + (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) && + !is_unicode($stat)) { printf("[004] Expecting Unicode error message!\n"); var_inspect($stat); } @@ -46,5 +48,5 @@ print "done!"; --EXPECTF-- Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in %s on line %d -Warning: mysql_stat(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_stat(): supplied resource is not a valid MySQL-Link resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_tablename.phpt b/ext/mysql/tests/mysql_tablename.phpt index 4bbe54d443..76007fde46 100644 --- a/ext/mysql/tests/mysql_tablename.phpt +++ b/ext/mysql/tests/mysql_tablename.phpt @@ -51,6 +51,6 @@ Warning: mysql_tablename(): Unable to jump to row -1 on MySQL result index %d in Warning: mysql_tablename(): Unable to jump to row 2 on MySQL result index %d in %s on line %d -Warning: mysql_tablename(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_tablename(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_thread_id.phpt b/ext/mysql/tests/mysql_thread_id.phpt index aa95d31944..a2e0f934c2 100644 --- a/ext/mysql/tests/mysql_thread_id.phpt +++ b/ext/mysql/tests/mysql_thread_id.phpt @@ -37,5 +37,5 @@ print "done!"; --EXPECTF-- Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in %s on line %d -Warning: mysql_thread_id(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_thread_id(): supplied resource is not a valid MySQL-Link resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_unbuffered_query.phpt b/ext/mysql/tests/mysql_unbuffered_query.phpt index 8754b58b59..8c3c2d6e10 100644 --- a/ext/mysql/tests/mysql_unbuffered_query.phpt +++ b/ext/mysql/tests/mysql_unbuffered_query.phpt @@ -48,7 +48,9 @@ if (mysql_unbuffered_query('DROP PROCEDURE IF EXISTS p', $link)) { printf("[008] Result seems wrong, dumping\n"); var_dump($tmp); } - if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp['p_version'])) { + if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && + (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) && + !is_unicode($tmp['p_version'])) { printf("[009] Expecting unicode string, dumping\n"); var_dump($tmp); } @@ -65,7 +67,9 @@ if (mysql_unbuffered_query('DROP PROCEDURE IF EXISTS p', $link)) { printf("[011] Result seems wrong, dumping\n"); var_dump($tmp); } - if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp['f_version'])) { + if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && + (version_compare(PHP_VERSION, '6.9.9', '<=') == 1) && + !is_unicode($tmp['f_version'])) { printf("[012] Expecting unicode string, dumping\n"); var_dump($tmp); } @@ -118,5 +122,5 @@ int(0) Notice: mysql_close(): Function called without first fetching all rows from a previous unbuffered query in %s on line %d -Warning: mysql_unbuffered_query(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_unbuffered_query(): supplied resource is not a valid MySQL-Link resource in %s on line %d done! diff --git a/ext/mysql/tests/setupdefault.inc b/ext/mysql/tests/setupdefault.inc index 6d25c20840..b13402ec14 100644 --- a/ext/mysql/tests/setupdefault.inc +++ b/ext/mysql/tests/setupdefault.inc @@ -3,7 +3,7 @@ // copy variables from connect.inc into mysql default connection ini settings, so that implicit mysql_connect() behaviour can be tested where needed // must be loaded AFTER connect.inc -ini_set('mysql.default_host', $host); +ini_set('mysql.default_host', $host . ":" . $port); ini_set('mysql.default_user', $user); ini_set('mysql.default_password', $passwd); |