diff options
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | acconfig.h.in | 4 | ||||
| -rw-r--r-- | configure.in.in | 53 | ||||
| -rw-r--r-- | ext/mysql/Makefile.am | 6 | ||||
| -rw-r--r-- | ext/mysql/config.h.stub | 3 | ||||
| -rw-r--r-- | ext/mysql/config.m4 | 50 | ||||
| -rw-r--r-- | ext/mysql/mysql.c | 1934 | ||||
| -rw-r--r-- | ext/mysql/php3_mysql.h | 120 | ||||
| -rw-r--r-- | ext/mysql/setup.stub | 6 | ||||
| -rw-r--r-- | internal_functions.c | 2 |
10 files changed, 2123 insertions, 59 deletions
diff --git a/Makefile.in b/Makefile.in index 876fc4d446..cf2cda2ef1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -71,7 +71,7 @@ OBJS = main.o internal_functions.o snprintf.o php3_sprintf.o \ FUNCTIONS_SOURCE = functions/apache.c functions/fhttpd.c \ functions/crypt.c functions/db.c functions/dl.c functions/filepro.c \ functions/head.c functions/imap.c functions/mime.c \ - functions/msql.c functions/mysql.c \ + functions/msql.c \ functions/oracle.c functions/oci8.c functions/pgsql.c \ functions/post.c functions/sybase.c \ functions/sybase-ct.c @BCMATH_SRC@ functions/xml.c \ @@ -138,7 +138,7 @@ distclean: clean distclean-recursive -rm -f libphp3.module stamp-h -rm -f regex/*.o regex/*.a regex/*.ih -rm -f doc/checkdoc doc/funcparse doc/version.ent - -rm -f do-conf test/test.log extra/gd/bdf2gdfont + -rm -f do-conf test/test.log -rm -f doc/Makefile regex/Makefile maintainer-clean-depend: maintainer-clean-depend-recursive diff --git a/acconfig.h.in b/acconfig.h.in index c5d3f9e1e4..08d1dc2e95 100644 --- a/acconfig.h.in +++ b/acconfig.h.in @@ -124,10 +124,6 @@ #define HAVE_SYBASE 0 #define HAVE_SYBASE_CT 0 -#ifndef HAVE_MYSQL -#define HAVE_MYSQL 0 -#endif - #ifndef HAVE_MSQL #define HAVE_MSQL 0 #endif diff --git a/configure.in.in b/configure.in.in index 0c19f12519..69c00f20bb 100644 --- a/configure.in.in +++ b/configure.in.in @@ -315,7 +315,7 @@ AC_ARG_WITH(apxs, withval=apxs fi APXS="$withval" - APXS_LDFLAGS="@ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFTK_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@" + APXS_LDFLAGS="@ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFTK_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@" APACHE_INCLUDE="-I`$APXS -q INCLUDEDIR`" BINNAME=libphp3.so INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME" @@ -1095,57 +1095,6 @@ dnl## AC_SUBST(SYBASE_CT_INCLUDE) INCLUDES="$INCLUDES $SYBASE_CT_INCLUDE" -AC_MSG_CHECKING(for MySQL support) -AC_ARG_WITH(mysql, -[ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base - install directory, defaults to /usr/local.], -[ - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - MYSQL_INCDIR=/usr/local/include/mysql - MYSQL_LIBDIR=/usr/local/lib/mysql - else - if test -f $withval/include/mysql/mysql.h; then - MYSQL_INCDIR=$withval/include/mysql - MYSQL_LIBDIR=$withval/lib/mysql - elif test -f $withval/include/mysql.h; then - MYSQL_INCDIR=$withval/include - MYSQL_LIBDIR=$withval/lib - else - AC_MSG_RESULT(no) - AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h under $withval) - fi - fi - MYSQL_INCLUDE=-I$MYSQL_INCDIR - if test -n "$APXS"; then - MYSQL_LFLAGS="'${apxs_runpath_switch}$MYSQL_LIBDIR' -L$MYSQL_LIBDIR" - else - MYSQL_LFLAGS="${ld_runpath_switch}$MYSQL_LIBDIR -L$MYSQL_LIBDIR" - fi - MYSQL_LIBS=-lmysqlclient - - AC_DEFINE(HAVE_MYSQL) - AC_MSG_RESULT(yes) - - dnl check for errmsg.h, which isn't installed by some versions of 3.21 - old_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $MYSQL_INCLUDE" - AC_CHECK_HEADERS(errmsg.h mysql.h) - CPPFLAGS="$old_CPPFLAGS" - else - AC_MSG_RESULT(no) -dnl Why are we defining HAVE_MYSQL here?? - AC_DEFINE(HAVE_MYSQL) - fi -],[ - AC_MSG_RESULT(no) -]) -AC_SUBST(MYSQL_LIBS) -AC_SUBST(MYSQL_LFLAGS) -dnl## AC_SUBST(MYSQL_INCLUDE) -INCLUDES="$INCLUDES $MYSQL_INCLUDE" - - AC_MSG_CHECKING(for mSQL support) AC_ARG_WITH(msql, [ --with-msql[=DIR] Include mSQL support. DIR is the mSQL base diff --git a/ext/mysql/Makefile.am b/ext/mysql/Makefile.am new file mode 100644 index 0000000000..4176f7e764 --- /dev/null +++ b/ext/mysql/Makefile.am @@ -0,0 +1,6 @@ +# $Id$ + +INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend +noinst_LIBRARIES=libphpext_mysql.a +libphpext_mysql_a_SOURCES=mysql.c + diff --git a/ext/mysql/config.h.stub b/ext/mysql/config.h.stub new file mode 100644 index 0000000000..bc14e05beb --- /dev/null +++ b/ext/mysql/config.h.stub @@ -0,0 +1,3 @@ +#ifndef HAVE_MYSQL +#define HAVE_MYSQL 0 +#endif diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 new file mode 100644 index 0000000000..c36f4b6479 --- /dev/null +++ b/ext/mysql/config.m4 @@ -0,0 +1,50 @@ +dnl $Id$ +dnl config.m4 for extension mysql +dnl don't forget to call PHP_EXTENSION(mysql) + +AC_MSG_CHECKING(for MySQL support) +AC_ARG_WITH(mysql, +[ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base + install directory, defaults to /usr/local.], +[ + if test "$withval" != "no"; then + if test "$withval" = "yes"; then + MYSQL_INCDIR=/usr/local/include/mysql + MYSQL_LIBDIR=/usr/local/lib/mysql + else + if test -f $withval/include/mysql/mysql.h; then + MYSQL_INCDIR=$withval/include/mysql + MYSQL_LIBDIR=$withval/lib/mysql + elif test -f $withval/include/mysql.h; then + MYSQL_INCDIR=$withval/include + MYSQL_LIBDIR=$withval/lib + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h under $withval) + fi + fi + MYSQL_INCLUDE=-I$MYSQL_INCDIR + if test -n "$APXS"; then + MYSQL_LFLAGS="'${apxs_runpath_switch}$MYSQL_LIBDIR' -L$MYSQL_LIBDIR" + else + MYSQL_LFLAGS="${ld_runpath_switch}$MYSQL_LIBDIR -L$MYSQL_LIBDIR" + fi + MYSQL_LIBS=-lmysqlclient + + AC_DEFINE(HAVE_MYSQL) + AC_MSG_RESULT(yes) + + dnl check for errmsg.h, which isn't installed by some versions of 3.21 + old_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $MYSQL_INCLUDE" + AC_CHECK_HEADERS(errmsg.h mysql.h) + CPPFLAGS="$old_CPPFLAGS" + else + AC_MSG_RESULT(no) + AC_DEFINE(HAVE_MYSQL, 0) + fi +],[ + AC_MSG_RESULT(no) +]) +EXTRA_LIBS="$EXTRA_LIBS $MYSQL_LFLAGS $MYSQL_LIBS" +INCLUDES="$INCLUDES $MYSQL_INCLUDE" diff --git a/ext/mysql/mysql.c b/ext/mysql/mysql.c new file mode 100644 index 0000000000..e472975f83 --- /dev/null +++ b/ext/mysql/mysql.c @@ -0,0 +1,1934 @@ +/* + +----------------------------------------------------------------------+ + | PHP HTML Embedded Scripting Language Version 3.0 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-1999 PHP Development Team (See Credits file) | + +----------------------------------------------------------------------+ + | This program is free software; you can redistribute it and/or modify | + | it under the terms of one of the following licenses: | + | | + | A) the GNU General Public License as published by the Free Software | + | Foundation; either version 2 of the License, or (at your option) | + | any later version. | + | | + | B) the PHP License as published by the PHP Development Team and | + | included in the distribution in the file: LICENSE | + | | + | This program is distributed in the hope that it will be useful, | + | but WITHOUT ANY WARRANTY; without even the implied warranty of | + | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | + | GNU General Public License for more details. | + | | + | You should have received a copy of both licenses referred to here. | + | If you did not, or have any questions about PHP licensing, please | + | contact core@php.net. | + +----------------------------------------------------------------------+ + | Authors: Zeev Suraski <bourbon@netvision.net.il> | + +----------------------------------------------------------------------+ + */ + +/* $Id$ */ + + +/* TODO: + * + * ? Safe mode implementation + */ + +#if COMPILE_DL +# if PHP_31 +# include "../phpdl.h" +# else +# include "dl/phpdl.h" +# endif +#endif + +#include "php.h" +#include "php_globals.h" +#include "ext/standard/php3_standard.h" +#include "php3_mysql.h" + + +#if WIN32|WINNT +#include <winsock.h> +#else +#include "build-defs.h" + +#if HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#include <netdb.h> +#include <netinet/in.h> +#endif + + +#include "php_ini.h" + +#if HAVE_MYSQL +# if HAVE_MYSQL_MYSQL_H +# include <mysql/mysql.h> +# else +# include <mysql.h> +# endif +#ifdef HAVE_MYSQL_REAL_CONNECT +#ifdef HAVE_ERRMSG_H +#include <errmsg.h> +#endif +#endif + +#define SAFE_STRING(s) ((s)?(s):"") + +#if MYSQL_VERSION_ID > 32199 +#define mysql_row_length_type unsigned long +#else +#define mysql_row_length_type unsigned int +#endif + + +function_entry mysql_functions[] = { + {"mysql_connect", php3_mysql_connect, NULL}, + {"mysql_pconnect", php3_mysql_pconnect, NULL}, + {"mysql_close", php3_mysql_close, NULL}, + {"mysql_select_db", php3_mysql_select_db, NULL}, + {"mysql_create_db", php3_mysql_create_db, NULL}, + {"mysql_drop_db", php3_mysql_drop_db, NULL}, + {"mysql_query", php3_mysql_query, NULL}, + {"mysql_db_query", php3_mysql_db_query, NULL}, + {"mysql_list_dbs", php3_mysql_list_dbs, NULL}, + {"mysql_list_tables", php3_mysql_list_tables, NULL}, + {"mysql_list_fields", php3_mysql_list_fields, NULL}, + {"mysql_error", php3_mysql_error, NULL}, +#ifdef mysql_errno + {"mysql_errno", php3_mysql_errno, NULL}, +#endif + {"mysql_affected_rows", php3_mysql_affected_rows, NULL}, + {"mysql_insert_id", php3_mysql_insert_id, NULL}, + {"mysql_result", php3_mysql_result, NULL}, + {"mysql_num_rows", php3_mysql_num_rows, NULL}, + {"mysql_num_fields", php3_mysql_num_fields, NULL}, + {"mysql_fetch_row", php3_mysql_fetch_row, NULL}, + {"mysql_fetch_array", php3_mysql_fetch_array, NULL}, + {"mysql_fetch_object", php3_mysql_fetch_object, NULL}, + {"mysql_data_seek", php3_mysql_data_seek, NULL}, + {"mysql_fetch_lengths", php3_mysql_fetch_lengths, NULL}, + {"mysql_fetch_field", php3_mysql_fetch_field, NULL}, + {"mysql_field_seek", php3_mysql_field_seek, NULL}, + {"mysql_free_result", php3_mysql_free_result, NULL}, + {"mysql_field_name", php3_mysql_field_name, NULL}, + {"mysql_field_table", php3_mysql_field_table, NULL}, + {"mysql_field_len", php3_mysql_field_len, NULL}, + {"mysql_field_type", php3_mysql_field_type, NULL}, + {"mysql_field_flags", php3_mysql_field_flags, NULL}, + /* for downwards compatability */ + {"mysql", php3_mysql_db_query, NULL}, + {"mysql_fieldname", php3_mysql_field_name, NULL}, + {"mysql_fieldtable", php3_mysql_field_table, NULL}, + {"mysql_fieldlen", php3_mysql_field_len, NULL}, + {"mysql_fieldtype", php3_mysql_field_type, NULL}, + {"mysql_fieldflags", php3_mysql_field_flags, NULL}, + {"mysql_selectdb", php3_mysql_select_db, NULL}, + {"mysql_createdb", php3_mysql_create_db, NULL}, + {"mysql_dropdb", php3_mysql_drop_db, NULL}, + {"mysql_freeresult", php3_mysql_free_result, NULL}, + {"mysql_numfields", php3_mysql_num_fields, NULL}, + {"mysql_numrows", php3_mysql_num_rows, NULL}, + {"mysql_listdbs", php3_mysql_list_dbs, NULL}, + {"mysql_listtables", php3_mysql_list_tables, NULL}, + {"mysql_listfields", php3_mysql_list_fields, NULL}, + {"mysql_db_name", php3_mysql_result, NULL}, + {"mysql_dbname", php3_mysql_result, NULL}, + {"mysql_tablename", php3_mysql_result, NULL}, + {NULL, NULL, NULL} +}; + +php3_module_entry mysql_module_entry = { + "MySQL", mysql_functions, php3_minit_mysql, php3_mshutdown_mysql, php3_rinit_mysql, NULL, php3_info_mysql, STANDARD_MODULE_PROPERTIES +}; + +#ifndef ZTS +php_mysql_globals mysql_globals; +#endif + +#ifdef COMPILE_DL +DLEXPORT php3_module_entry *get_module(void) { return &mysql_module_entry; } +#endif + +#if APACHE +extern void timeout(int sig); +#endif + +#define CHECK_LINK(link) { if (link==-1) { php3_error(E_WARNING,"MySQL: A link to the server could not be established"); RETURN_FALSE; } } + +/* NOTE Don't ask me why, but soon as I made this the list + * destructor, I stoped getting access violations in windows + * with mysql 3.22.7a + */ +static void _free_mysql_result(MYSQL_RES *mysql_result){ + mysql_free_result(mysql_result); +} + + +static void php_mysql_set_default_link(int id) +{ + MySLS_FETCH(); + + if (MySG(default_link)!=-1) { + php3_list_delete(MySG(default_link)); + } + MySG(default_link) = id; + zend_list_addref(id); +} + + +static void _close_mysql_link(MYSQL *link) +{ +#if APACHE + void (*handler) (int); +#endif + MySLS_FETCH(); + +#if APACHE + handler = signal(SIGPIPE, SIG_IGN); +#endif + + mysql_close(link); + +#if APACHE + signal(SIGPIPE,handler); +#endif + + efree(link); + MySG(num_links)--; +} + +static void _close_mysql_plink(MYSQL *link) +{ +#if APACHE + void (*handler) (int); +#endif + MySLS_FETCH(); + +#if APACHE + handler = signal(SIGPIPE, SIG_IGN); +#endif + + mysql_close(link); + +#if APACHE + signal(SIGPIPE,handler); +#endif + + free(link); + MySG(num_persistent)--; + MySG(num_links)--; +} + + +static PHP_INI_MH(OnMySQLInt) +{ + long *p; +#ifndef ZTS + char *base = (char *) &mysql_globals; +#else + char *base; + MySLS_FETCH(); + + base = (char *) mysql_globals; +#endif + + p = (long *) (base+(size_t) mh_arg); + + *p = atoi(new_value); + return SUCCESS; +} + + +static PHP_INI_MH(OnMySQLStr) +{ + char **p; +#ifndef ZTS + char *base = (char *) &mysql_globals; +#else + char *base; + MySLS_FETCH(); + + base = (char *) mysql_globals; +#endif + + p = (char **) (base+(size_t) mh_arg); + + *p = new_value; + return SUCCESS; +} + + +static PHP_INI_MH(OnMySQLPort) +{ + MySLS_FETCH(); + + if (new_value==NULL) { /* default port */ +#if !(WIN32|WINNT) + struct servent *serv_ptr; + char *env; + + MySG(default_port) = MYSQL_PORT; + if ((serv_ptr = getservbyname("mysql", "tcp"))) { + MySG(default_port) = (uint) ntohs((ushort) serv_ptr->s_port); + } + if ((env = getenv("MYSQL_TCP_PORT"))) { + MySG(default_port) = (uint) atoi(env); + } +#else + MySG(default_port) = MYSQL_PORT; +#endif + } else { + MySG(default_port) = atoi(new_value); + } + return SUCCESS; +} + + +PHP_INI_BEGIN() + PHP_INI_ENTRY("mysql.allow_persistent", "1", PHP_INI_SYSTEM, OnMySQLInt, (void *) XtOffsetOf(php_mysql_globals, allow_persistent)) + PHP_INI_ENTRY("mysql.max_persistent", "-1", PHP_INI_SYSTEM, OnMySQLInt, (void *) XtOffsetOf(php_mysql_globals, max_persistent)) + PHP_INI_ENTRY("mysql.max_links", "-1", PHP_INI_SYSTEM, OnMySQLInt, (void *) XtOffsetOf(php_mysql_globals, max_links)) + PHP_INI_ENTRY("mysql.default_host", NULL, PHP_INI_ALL, OnMySQLStr, (void *) XtOffsetOf(php_mysql_globals, default_host)) + PHP_INI_ENTRY("mysql.default_user", NULL, PHP_INI_ALL, OnMySQLStr, (void *) XtOffsetOf(php_mysql_globals, default_user)) + PHP_INI_ENTRY("mysql.default_password", NULL, PHP_INI_ALL, OnMySQLStr, (void *) XtOffsetOf(php_mysql_globals, default_password)) + PHP_INI_ENTRY("mysql.default_port", NULL, PHP_INI_ALL, OnMySQLPort, NULL) +PHP_INI_END() + + +int php3_minit_mysql(INIT_FUNC_ARGS) +{ + REGISTER_INI_ENTRIES(); + MySG(num_persistent)=0; + MySG(le_result) = register_list_destructors(_free_mysql_result,NULL); + MySG(le_link) = register_list_destructors(_close_mysql_link,NULL); + MySG(le_plink) = register_list_destructors(NULL,_close_mysql_plink); + +#if 0 + printf("Registered: %d,%d,%d\n",MySG(le_result),MySG(le_link),MySG(le_plink)); +#endif + mysql_module_entry.type = type; + + return SUCCESS; +} + + +int php3_mshutdown_mysql(SHUTDOWN_FUNC_ARGS) +{ + UNREGISTER_INI_ENTRIES(); + return SUCCESS; +} + +int php3_rinit_mysql(INIT_FUNC_ARGS) +{ + MySLS_FETCH(); + + MySG(default_link)=-1; + MySG(num_links) = MySG(num_persistent); + return SUCCESS; +} + + +void php3_info_mysql(void) +{ + char maxp[16],maxl[16]; + MySLS_FETCH(); + + if (MySG(max_persistent)==-1) { + strcpy(maxp,"Unlimited"); + } else { + snprintf(maxp,15,"%ld",MySG(max_persistent)); + maxp[15]=0; + } + if (MySG(max_links)==-1) { + strcpy(maxl,"Unlimited"); + } else { + snprintf(maxl,15,"%ld",MySG(max_links)); + maxl[15]=0; + } + php3_printf("<table cellpadding=5>" + "<tr><td>Allow persistent links:</td><td>%s</td></tr>\n" + "<tr><td>Persistent links:</td><td>%d/%s</td></tr>\n" + "<tr><td>Total links:</td><td>%d/%s</td></tr>\n" + "<tr><td>Client API version:</td><td>%s</td></tr>\n" +#if !(WIN32|WINNT) + "<tr><td valign=\"top\">Compilation definitions:</td><td>" + "<tt>MYSQL_INCLUDE=%s<br>\n" + "MYSQL_LFLAGS=%s<br>\n" + "MYSQL_LIBS=%s<br></tt></td></tr>" +#endif + "</table>\n", + (MySG(allow_persistent)?"Yes":"No"), + MySG(num_persistent),maxp, + MySG(num_links),maxl, + mysql_get_client_info() +#if !(WIN32|WINNT) + ,PHP_MYSQL_INCLUDE,PHP_MYSQL_LFLAGS,PHP_MYSQL_LIBS +#endif + ); +} + + +static void php3_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) +{ +#if APACHE + void (*handler) (int); +#endif + char *user,*passwd,*host,*tmp; + char *hashed_details; + int hashed_details_length,port; + MYSQL *mysql; + MySLS_FETCH(); + + if (PG(sql_safe_mode)) { + if (ARG_COUNT(ht)>0) { + php3_error(E_NOTICE,"SQL safe mode in effect - ignoring host/user/password information"); + } + host=passwd=NULL; + user=_php3_get_current_user(); + hashed_details_length = strlen(user)+5+3; + hashed_details = (char *) emalloc(hashed_details_length+1); + sprintf(hashed_details,"mysql__%s_",user); + } else { + host = MySG(default_host); + user = MySG(default_user); + passwd = MySG(default_password); + + switch(ARG_COUNT(ht)) { + case 0: /* defaults */ + break; + case 1: { + pval *yyhost; + + if (getParameters(ht, 1, &yyhost)==FAILURE) { + RETURN_FALSE; + } + convert_to_string(yyhost); + host = yyhost->value.str.val; + } + break; + case 2: { + pval *yyhost,*yyuser; + + if (getParameters(ht, 2, &yyhost, &yyuser)==FAILURE) { + RETURN_FALSE; + } + convert_to_string(yyhost); + convert_to_string(yyuser); + host = yyhost->value.str.val; + user = yyuser->value.str.val; + } + break; + case 3: { + pval *yyhost,*yyuser,*yypasswd; + + if (getParameters(ht, 3, &yyhost, &yyuser, &yypasswd) == FAILURE) { + RETURN_FALSE; + } + convert_to_string(yyhost); + convert_to_string(yyuser); + convert_to_string(yypasswd); + host = yyhost->value.str.val; + user = yyuser->value.str.val; + passwd = yypasswd->value.str.val; + } + break; + default: + WRONG_PARAM_COUNT; + break; + } + hashed_details_length = sizeof("mysql___")-1 + strlen(SAFE_STRING(host))+strlen(SAFE_STRING(user))+strlen(SAFE_STRING(passwd)); + hashed_details = (char *) emalloc(hashed_details_length+1); + sprintf(hashed_details,"mysql_%s_%s_%s",SAFE_STRING(host), SAFE_STRING(user), SAFE_STRING(passwd)); + } + + /* We cannot use mysql_port anymore in windows, need to use + * mysql_real_connect() to set the port. + */ + if (host && (tmp=strchr(host,':'))) { + *tmp=0; + tmp++; + port = atoi(tmp); + } else { + port = MySG(default_port); + } + +#if MYSQL_VERSION_ID < 32200 + mysql_port = port; +#endif + + if (!MySG(allow_persistent)) { + persistent=0; + } + if (persistent) { + list_entry *le; + + /* try to find if we already have this link in our persistent list */ + if (_php3_hash_find(plist, hashed_details, hashed_details_length+1, (void **) &le)==FAILURE) { /* we don't */ + list_entry new_le; + + if (MySG(max_links)!=-1 && MySG(num_links)>=MySG(max_links)) { + php3_error(E_WARNING,"MySQL: Too many open links (%d)",MySG(num_links)); + efree(hashed_details); + RETURN_FALSE; + } + if (MySG(max_persistent)!=-1 && MySG(num_persistent)>=MySG(max_persistent)) { + php3_error(E_WARNING,"MySQL: Too many open persistent links (%d)",MySG(num_persistent)); + efree(hashed_details); + RETURN_FALSE; + } + /* create the link */ + mysql = (MYSQL *) malloc(sizeof(MYSQL)); +#if MYSQL_VERSION_ID > 32199 /* this lets us set the port number */ + mysql_init(mysql); + if (mysql_real_connect(mysql,host,user,passwd,NULL,port,NULL,0)==NULL) { +#else + if (mysql_connect(mysql,host,user,passwd)==NULL) { +#endif + php3_error(E_WARNING,mysql_error(mysql)); + free(mysql); + efree(hashed_details); + RETURN_FALSE; + } + + /* hash it up */ + new_le.type = MySG(le_plink); + new_le.ptr = mysql; + if (_php3_hash_update(plist, hashed_details, hashed_details_length+1, (void *) &new_le, sizeof(list_entry), NULL)==FAILURE) { + free(mysql); + efree(hashed_details); + RETURN_FALSE; + } + MySG(num_persistent)++; + MySG(num_links)++; + } else { /* we do */ + if (le->type != MySG(le_plink)) { + RETURN_FALSE; + } + /* ensure that the link did not die */ +#if APACHE + handler=signal(SIGPIPE,SIG_IGN); +#endif +#if defined(mysql_errno) && defined(CR_SERVER_GONE_ERROR) + mysql_stat(le->ptr); + if (mysql_errno((MYSQL *)le->ptr) == CR_SERVER_GONE_ERROR) { +#else + if (!strcasecmp(mysql_stat(le->ptr),"mysql server has gone away")) { /* the link died */ +#endif +#if APACHE + signal(SIGPIPE,handler); +#endif +#if MYSQL_VERSION_ID > 32199 /* this lets us set the port number */ + if (mysql_real_connect(le->ptr,host,user,passwd,NULL,port,NULL,0)==NULL) { +#else + if (mysql_connect(le->ptr,host,user,passwd)==NULL) { +#endif + php3_error(E_WARNING,"MySQL: Link to server lost, unable to reconnect"); + _php3_hash_del(plist, hashed_details, hashed_details_length+1); + efree(hashed_details); + RETURN_FALSE; + } + } +#if APACHE + signal(SIGPIPE,handler); +#endif + mysql = (MYSQL *) le->ptr; + } + return_value->value.lval = php3_list_insert(mysql,MySG(le_plink)); + return_value->type = IS_RESOURCE; + } else { /* non persistent */ + list_entry *index_ptr,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 (_php3_hash_find(list,hashed_details,hashed_details_length+1,(void **) &index_ptr)==SUCCESS) { + int type,link; + void *ptr; + +#ifdef THREAD_SAFE + if (index_ptr->type != _php3_le_index_ptr()) { +#else + if (index_ptr->type != le_index_ptr) { +#endif + RETURN_FALSE; + } + link = (int) index_ptr->ptr; + ptr = php3_list_find(link,&type); /* check if the link is still there */ + if (ptr && (type==MySG(le_link) || type==MySG(le_plink))) { + zend_list_addref(link); + return_value->value.lval = link; + php_mysql_set_default_link(link); + return_value->type = IS_RESOURCE; + efree(hashed_details); + return; + } else { + _php3_hash_del(list,hashed_details,hashed_details_length+1); + } + } + if (MySG(max_links)!=-1 && MySG(num_links)>=MySG(max_links)) { + php3_error(E_WARNING,"MySQL: Too many open links (%d)",MySG(num_links)); + efree(hashed_details); + RETURN_FALSE; + } + + mysql = (MYSQL *) emalloc(sizeof(MYSQL)); +#if MYSQL_VERSION_ID > 32199 /* this lets us set the port number */ + mysql_init(mysql); + if (mysql_real_connect(mysql,host,user,passwd,NULL,port,NULL,0)==NULL) { +#else + if (mysql_connect(mysql,host,user,passwd)==NULL) { +#endif + php3_error(E_WARNING,"MySQL Connection Failed: %s\n",mysql_error(mysql)); + efree(hashed_details); + efree(mysql); + RETURN_FALSE; + } + + /* add it to the list */ + return_value->value.lval = php3_list_insert(mysql,MySG(le_link)); + return_value->type = IS_RESOURCE; + + /* add it to the hash */ + new_index_ptr.ptr = (void *) return_value->value.lval; +#ifdef THREAD_SAFE + new_index_ptr.type = _php3_le_index_ptr(); +#else + new_index_ptr.type = le_index_ptr; +#endif + if (_php3_hash_update(list,hashed_details,hashed_details_length+1,(void *) &new_index_ptr, sizeof(list_entry), NULL)==FAILURE) { + efree(hashed_details); + RETURN_FALSE; + } + MySG(num_links)++; + } + + efree(hashed_details); + php_mysql_set_default_link(return_value->value.lval); +} + + +static int php3_mysql_get_default_link(INTERNAL_FUNCTION_PARAMETERS MySLS_DC) +{ + if (MySG(default_link)==-1) { /* no link opened yet, implicitly open one */ + php3_mysql_do_connect(0, return_value,list,plist,0); + } + return MySG(default_link); +} + +/* {{{ proto int mysql_connect([string hostname[:port]] [, string username] [, string password]) + Open a connection to a MySQL Server */ +void php3_mysql_connect(INTERNAL_FUNCTION_PARAMETERS) +{ + php3_mysql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0); +} +/* }}} */ + +/* {{{ proto int mysql_pconnect([string hostname[:port]] [, string username] [, string password]) + Open a persistent connection to a MySQL Server */ +void php3_mysql_pconnect(INTERNAL_FUNCTION_PARAMETERS) +{ + php3_mysql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,1); +} +/* }}} */ + +/* {{{ proto int mysql_close([int link_identifier]) + Close a MySQL connection */ +void php3_mysql_close(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *mysql_link; + int id,type; + MYSQL *mysql; + + switch (ARG_COUNT(ht)) { + case 0: + id = MySG(default_link); + break; + case 1: + if (getParameters(ht, 1, &mysql_link)==FAILURE) { + RETURN_FALSE; + } + convert_to_long(mysql_link); + id = mysql_link->value.lval; + break; + default: + WRONG_PARAM_COUNT; + break; + } + + mysql = (MYSQL *) php3_list_find(id,&type); + if (type!=MySG(le_link) && type!=MySG(le_plink)) { + php3_error(E_WARNING,"%d is not a MySQL link index",id); + RETURN_FALSE; + } + + php3_list_delete(id); + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto int mysql_select_db(string database_name [, int link_identifier]) + Select a MySQL database */ +void php3_mysql_select_db(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *db,*mysql_link; + int id,type; + MYSQL *mysql; + + + switch(ARG_COUNT(ht)) { + case 1: + if (getParameters(ht, 1, &db)==FAILURE) { + RETURN_FALSE; + } + id = php3_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC); + break; + case 2: + if (getParameters(ht, 2, &db, &mysql_link)==FAILURE) { + RETURN_FALSE; + } + convert_to_long(mysql_link); + id = mysql_link->value.lval; + break; + default: + WRONG_PARAM_COUNT; + break; + } + + CHECK_LINK(id); + + mysql = (MYSQL *) php3_list_find(id,&type); + if (type!=MySG(le_link) && type!=MySG(le_plink)) { + php3_error(E_WARNING,"%d is not a MySQL link index",id); + RETURN_FALSE; + } + + convert_to_string(db); + + if (mysql_select_db(mysql,db->value.str.val)!=0) { + RETURN_FALSE; + } else { + RETURN_TRUE; + } +} +/* }}} */ + +/* {{{ proto int mysql_create_db(string database_name [, int link_identifier]) + Create a MySQL database */ +void php3_mysql_create_db(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *db,*mysql_link; + int id,type; + MYSQL *mysql; + + + switch(ARG_COUNT(ht)) { + case 1: + if (getParameters(ht, 1, &db)==FAILURE) { + RETURN_FALSE; + } + id = php3_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC); + break; + case 2: + if (getParameters(ht, 2, &db, &mysql_link)==FAILURE) { + RETURN_FALSE; + } + convert_to_long(mysql_link); + id = mysql_link->value.lval; + break; + default: + WRONG_PARAM_COUNT; + break; + } + + CHECK_LINK(id); + + mysql = (MYSQL *) php3_list_find(id,&type); + if (type!=MySG(le_link) && type!=MySG(le_plink)) { + php3_error(E_WARNING,"%d is not a MySQL link index",id); + RETURN_FALSE; + } + + convert_to_string(db); + if (mysql_create_db(mysql,db->value.str.val)==0) { + RETURN_TRUE; + } else { + RETURN_FALSE; + } +} +/* }}} */ + +/* {{{ proto int mysql_drop_db(string database_name [, int link_identifier]) + Drop (delete) a MySQL database */ +void php3_mysql_drop_db(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *db,*mysql_link; + int id,type; + MYSQL *mysql; + + + switch(ARG_COUNT(ht)) { + case 1: + if (getParameters(ht, 1, &db)==FAILURE) { + RETURN_FALSE; + } + id = php3_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC); + break; + case 2: + if (getParameters(ht, 2, &db, &mysql_link)==FAILURE) { + RETURN_FALSE; + } + convert_to_long(mysql_link); + id = mysql_link->value.lval; + break; + default: + WRONG_PARAM_COUNT; + break; + } + + CHECK_LINK(id); + + mysql = (MYSQL *) php3_list_find(id,&type); + if (type!=MySG(le_link) && type!=MySG(le_plink)) { + php3_error(E_WARNING,"%d is not a MySQL link index",id); + RETURN_FALSE; + } + + convert_to_string(db); + if (mysql_drop_db(mysql,db->value.str.val)==0) { + RETURN_TRUE; + } else { + RETURN_FALSE; + } +} +/* }}} */ + +/* {{{ proto int mysql_query(string query [, int link_identifier]) + Send an SQL query to MySQL */ +void php3_mysql_query(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *query,*mysql_link; + int id,type; + MYSQL *mysql; + MYSQL_RES *mysql_result; + + + switch(ARG_COUNT(ht)) { + case 1: + if (getParameters(ht, 1, &query)==FAILURE) { + RETURN_FALSE; + } + id = php3_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC); + break; + case 2: + if (getParameters(ht, 2, &query, &mysql_link)==FAILURE) { + RETURN_FALSE; + } + convert_to_long(mysql_link); + id = mysql_link->value.lval; + break; + default: + WRONG_PARAM_COUNT; + break; + } + + mysql = (MYSQL *) php3_list_find(id,&type); + if (type!=MySG(le_link) && type!=MySG(le_plink)) { + php3_error(E_WARNING,"%d is not a MySQL link index",id); + RETURN_FALSE; + } + + convert_to_string(query); + /* mysql_query binary unsafe, use mysql_real_query */ +#if MYSQL_VERSION_ID > 32199 + if (mysql_real_query(mysql,query->value.str.val,query->value.str.len)!=0) { + RETURN_FALSE; + } +#else + if (mysql_query(mysql,query->value.str.val)!=0) { + RETURN_FALSE; + } +#endif + if ((mysql_result=mysql_store_result(mysql))==NULL) { + /*php3_error(E_WARNING,"Unable to save MySQL query result"); + RETURN_FALSE; + */ + RETURN_TRUE; + } + return_value->value.lval = php3_list_insert(mysql_result,MySG(le_result)); + return_value->type = IS_RESOURCE; +} +/* }}} */ + +/* {{{ proto int mysql_db_query(string database_name, string query [, int link_identifier]) + Send an SQL query to MySQL */ +void php3_mysql_db_query(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *db,*query,*mysql_link; + int id,type; + MYSQL *mysql; + MYSQL_RES *mysql_result; + + + switch(ARG_COUNT(ht)) { + case 2: + if (getParameters(ht, 2, &db, &query)==FAILURE) { + RETURN_FALSE; + } + id = php3_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC); + break; + case 3: + if (getParameters(ht, 3, &db, &query, &mysql_link)==FAILURE) { + RETURN_FALSE; + } + convert_to_long(mysql_link); + id = mysql_link->value.lval; + break; + default: + WRONG_PARAM_COUNT; + break; + } + + CHECK_LINK(id); + + mysql = (MYSQL *) php3_list_find(id,&type); + if (type!=MySG(le_link) && type!=MySG(le_plink)) { + php3_error(E_WARNING,"%d is not a MySQL link index",id); + RETURN_FALSE; + } + + convert_to_string(db); + if (mysql_select_db(mysql,db->value.str.val)!=0) { + RETURN_FALSE; + } + + convert_to_string(query); + /* mysql_query is binary unsafe, use mysql_real_query */ +#if MYSQL_VERSION_ID > 32199 + if (mysql_real_query(mysql,query->value.str.val,query->value.str.len)!=0) { + RETURN_FALSE; + } +#else + if (mysql_query(mysql,query->value.str.val)!=0) { + RETURN_FALSE; + } +#endif + if ((mysql_result=mysql_store_result(mysql))==NULL) { + /* + php3_error(E_WARNING,"Unable to save MySQL query result"); + RETURN_FALSE; + */ + RETURN_TRUE; + } + return_value->value.lval = php3_list_insert(mysql_result,MySG(le_result)); + return_value->type = IS_RESOURCE; +} +/* }}} */ + +/* {{{ proto int mysql_list_dbs([int link_identifier]) + List databases available on a MySQL server */ +void php3_mysql_list_dbs(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *mysql_link; + int id,type; + MYSQL *mysql; + MYSQL_RES *mysql_result; + + + switch(ARG_COUNT(ht)) { + case 0: + id = php3_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC); + break; + case 1: + if (getParameters(ht, 1, &mysql_link)==FAILURE) { + RETURN_FALSE; + } + convert_to_long(mysql_link); + id = mysql_link->value.lval; + break; + default: + WRONG_PARAM_COUNT; + break; + } + + CHECK_LINK(id); + + mysql = (MYSQL *) php3_list_find(id,&type); + if (type!=MySG(le_link) && type!=MySG(le_plink)) { + php3_error(E_WARNING,"%d is not a MySQL link index",id); + RETURN_FALSE; + } + if ((mysql_result=mysql_list_dbs(mysql,NULL))==NULL) { + php3_error(E_WARNING,"Unable to save MySQL query result"); + RETURN_FALSE; + } + return_value->value.lval = php3_list_insert(mysql_result,MySG(le_result)); + return_value->type = IS_RESOURCE; +} +/* }}} */ + +/* {{{ proto int mysql_list_tables(string database_name [, int link_identifier]) + List tables in a MySQL database */ +void php3_mysql_list_tables(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *db,*mysql_link; + int id,type; + MYSQL *mysql; + MYSQL_RES *mysql_result; + + + switch(ARG_COUNT(ht)) { + case 1: + if (getParameters(ht, 1, &db)==FAILURE) { + RETURN_FALSE; + } + id = php3_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC); + break; + case 2: + if (getParameters(ht, 2, &db, &mysql_link)==FAILURE) { + RETURN_FALSE; + } + convert_to_long(mysql_link); + id = mysql_link->value.lval; + break; + default: + WRONG_PARAM_COUNT; + break; + } + + CHECK_LINK(id); + + mysql = (MYSQL *) php3_list_find(id,&type); + if (type!=MySG(le_link) && type!=MySG(le_plink)) { + php3_error(E_WARNING,"%d is not a MySQL link index",id); + RETURN_FALSE; + } + + convert_to_string(db); + if (mysql_select_db(mysql,db->value.str.val)!=0) { + RETURN_FALSE; + } + if ((mysql_result=mysql_list_tables(mysql,NULL))==NULL) { + php3_error(E_WARNING,"Unable to save MySQL query result"); + RETURN_FALSE; + } + return_value->value.lval = php3_list_insert(mysql_result,MySG(le_result)); + return_value->type = IS_RESOURCE; +} +/* }}} */ + +/* {{{ proto int mysql_list_fields(string database_name, string table_name [, int link_identifier]) + List MySQL result fields */ +void php3_mysql_list_fields(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *db,*table,*mysql_link; + int id,type; + MYSQL *mysql; + MYSQL_RES *mysql_result; + + + switch(ARG_COUNT(ht)) { + case 2: + if (getParameters(ht, 2, &db, &table)==FAILURE) { + RETURN_FALSE; + } + id = php3_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MySLS_CC); + break; + case 3: + if (getParameters(ht, 3, &db, &table, &mysql_link)==FAILURE) { + RETURN_FALSE; + } + convert_to_long(mysql_link); + id = mysql_link->value.lval; + break; + default: + WRONG_PARAM_COUNT; + break; + } + + CHECK_LINK(id); + + mysql = (MYSQL *) php3_list_find(id,&type); + if (type!=MySG(le_link) && type!=MySG(le_plink)) { + php3_error(E_WARNING,"%d is not a MySQL link index",id); + RETURN_FALSE; + } + + convert_to_string(db); + if (mysql_select_db(mysql,db->value.str.val)!=0) { + RETURN_FALSE; + } + convert_to_string(table); + if ((mysql_result=mysql_list_fields(mysql,table->value.str.val,NULL))==NULL) { + php3_error(E_WARNING,"Unable to save MySQL query result"); + RETURN_FALSE; + } + return_value->value.lval = php3_list_insert(mysql_result,MySG(le_result)); + return_value->type = IS_RESOURCE; +} +/* }}} */ + +/* {{{ proto string mysql_error([int link_identifier]) + Returns the text of the error message from previous MySQL operation */ +void php3_mysql_error(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *mysql_link; + int id,type; + MYSQL *mysql; + + + switch(ARG_COUNT(ht)) { + case 0: + id = MySG(default_link); + break; + case 1: + if (getParameters(ht, 1, &mysql_link)==FAILURE) { + RETURN_FALSE; + } + convert_to_long(mysql_link); + id = mysql_link->value.lval; + break; + default: + WRONG_PARAM_COUNT; + break; + } + + if (id==-1) { + RETURN_FALSE; + } + mysql = (MYSQL *) php3_list_find(id,&type); + if (type!=MySG(le_link) && type!=MySG(le_plink)) { + php3_error(E_WARNING,"%d is not a MySQL link index",id); + RETURN_FALSE; + } + + RETURN_STRING(mysql_error(mysql),1); +} +/* }}} */ + +/* {{{ proto int mysql_errno([int link_identifier]) + Returns the number of the error message from previous MySQL operation */ +#ifdef mysql_errno +void php3_mysql_errno(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *mysql_link; + int id,type; + MYSQL *mysql; + + + switch(ARG_COUNT(ht)) { + case 0: + id = MySG(default_link); + break; + case 1: + if (getParameters(ht, 1, &mysql_link)==FAILURE) { + RETURN_FALSE; + } + convert_to_long(mysql_link); + id = mysql_link->value.lval; + break; + default: + WRONG_PARAM_COUNT; + break; + } + + if (id==-1) { + RETURN_FALSE; + } + mysql = (MYSQL *) php3_list_find(id,&type); + if (type!=MySG(le_link) && type!=MySG(le_plink)) { + php3_error(E_WARNING,"%d is not a MySQL link index",id); + RETURN_FALSE; + } + + RETURN_LONG(mysql_errno(mysql)); +} +#endif +/* }}} */ + +/* {{{ proto int mysql_affected_rows([int link_identifier]) + Get number of affected rows in previous MySQL operation */ +void php3_mysql_affected_rows(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *mysql_link; + int id,type; + MYSQL *mysql; + + + switch(ARG_COUNT(ht)) { + case 0: + id = MySG(default_link); + break; + case 1: + if (getParameters(ht, 1, &mysql_link)==FAILURE) { + RETURN_FALSE; + } + convert_to_long(mysql_link); + id = mysql_link->value.lval; + break; + default: + WRONG_PARAM_COUNT; + break; + } + + mysql = (MYSQL *) php3_list_find(id,&type); + if (type!=MySG(le_link) && type!=MySG(le_plink)) { + php3_error(E_WARNING,"%d is not a MySQL link index",id); + RETURN_FALSE; + } + + /* conversion from int64 to long happing here */ + return_value->value.lval = (long)mysql_affected_rows(mysql); + return_value->type = IS_LONG; +} +/* }}} */ + +/* {{{ proto int mysql_insert_id([int link_identifier]) + Get the id generated from the previous INSERT operation */ +void php3_mysql_insert_id(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *mysql_link; + int id,type; + MYSQL *mysql; + + + switch(ARG_COUNT(ht)) { + case 0: + id = MySG(default_link); + break; + case 1: + if (getParameters(ht, 1, &mysql_link)==FAILURE) { + RETURN_FALSE; + } + convert_to_long(mysql_link); + id = mysql_link->value.lval; + break; + default: + WRONG_PARAM_COUNT; + break; + } + + mysql = (MYSQL *) php3_list_find(id,&type); + if (type!=MySG(le_link) && type!=MySG(le_plink)) { + php3_error(E_WARNING,"%d is not a MySQL link index",id); + RETURN_FALSE; + } + + /* conversion from int64 to long happing here */ + return_value->value.lval = (long)mysql_insert_id(mysql); + return_value->type = IS_LONG; +} +/* }}} */ + +/* {{{ proto int mysql_result(int result, int row [, mixed field]) + Get result data */ +void php3_mysql_result(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *result, *row, *field=NULL; + MYSQL_RES *mysql_result; + MYSQL_ROW sql_row; + mysql_row_length_type *sql_row_lengths; + int type,field_offset=0; + PLS_FETCH(); + + switch (ARG_COUNT(ht)) { + case 2: + if (getParameters(ht, 2, &result, &row)==FAILURE) { + RETURN_FALSE; + } + break; + case 3: + if (getParameters(ht, 3, &result, &row, &field)==FAILURE) { + RETURN_FALSE; + } + break; + default: + WRONG_PARAM_COUNT; + break; + } + + convert_to_long(result); + mysql_result = (MYSQL_RES *) php3_list_find(result->value.lval,&type); + + if (type!=MySG(le_result)) { + php3_error(E_WARNING,"%d is not a MySQL result index",result->value.lval); + RETURN_FALSE; + } + + convert_to_long(row); + if (row->value.lval<0 || row->value.lval>=(int)mysql_num_rows(mysql_result)) { + php3_error(E_WARNING,"Unable to jump to row %d on MySQL result index %d",row->value.lval,result->value.lval); + RETURN_FALSE; + } + mysql_data_seek(mysql_result,row->value.lval); + if ((sql_row=mysql_fetch_row(mysql_result))==NULL + || (sql_row_lengths=mysql_fetch_lengths(mysql_result))==NULL) { /* shouldn't happen? */ + RETURN_FALSE; + } + + if (field) { + switch(field->type) { + case IS_STRING: { + int i=0; + MYSQL_FIELD *tmp_field; + char *table_name,*field_name,*tmp; + + if ((tmp=strchr(field->value.str.val,'.'))) { + *tmp = 0; + table_name = estrdup(field->value.str.val); + field_name = estrdup(tmp+1); + } else { + table_name = NULL; + field_name = estrndup(field->value.str.val,field->value.str.len); + } + 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)) { + field_offset = i; + break; + } + i++; + } + if (!tmp_field) { /* no match found */ + php3_error(E_WARNING,"%s%s%s not found in MySQL result index %d", + (table_name?table_name:""), (table_name?".":""), field_name, result->value.lval); + efree(field_name); + if (table_name) { + efree(table_name); + } + RETURN_FALSE; + } + efree(field_name); + if (table_name) { + efree(table_name); + } + } + break; + default: + convert_to_long(field); + field_offset = field->value.lval; + if (field_offset<0 || field_offset>=(int)mysql_num_fields(mysql_result)) { + php3_error(E_WARNING,"Bad column offset specified"); + RETURN_FALSE; + } + break; + } + } + + if (sql_row[field_offset]) { + if (PG(magic_quotes_runtime)) { + return_value->value.str.val = _php3_addslashes(sql_row[field_offset],sql_row_lengths[field_offset],&return_value->value.str.len,0); + } else { + return_value->value.str.len = sql_row_lengths[field_offset]; + return_value->value.str.val = (char *) safe_estrndup(sql_row[field_offset],return_value->value.str.len); + } + } else { + return_value->value.str.val = undefined_variable_string; + return_value->value.str.len=0; + return_value->type = IS_STRING; + } + + return_value->type = IS_STRING; +} +/* }}} */ + +/* {{{ proto int mysql_num_rows(int result) + Get number of rows in a result */ +void php3_mysql_num_rows(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *result; + MYSQL_RES *mysql_result; + int type; + + + if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) { + WRONG_PARAM_COUNT; + } + + convert_to_long(result); + mysql_result = (MYSQL_RES *) php3_list_find(result->value.lval,&type); + + if (type!=MySG(le_result)) { + php3_error(E_WARNING,"%d is not a MySQL result index",result->value.lval); + RETURN_FALSE; + } + + /* conversion from int64 to long happing here */ + return_value->value.lval = (long)mysql_num_rows(mysql_result); + return_value->type = IS_LONG; +} +/* }}} */ + +/* {{{ proto int mysql_num_fields(int result) + Get number of fields in a result */ +void php3_mysql_num_fields(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *result; + MYSQL_RES *mysql_result; + int type; + + + if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) { + WRONG_PARAM_COUNT; + } + + convert_to_long(result); + mysql_result = (MYSQL_RES *) php3_list_find(result->value.lval,&type); + + if (type!=MySG(le_result)) { + php3_error(E_WARNING,"%d is not a MySQL result index",result->value.lval); + RETURN_FALSE; + } + + return_value->value.lval = mysql_num_fields(mysql_result); + return_value->type = IS_LONG; +} +/* }}} */ + +/* {{{ proto array mysql_fetch_row(int result) + Get a result row as an enumerated array */ +void php3_mysql_fetch_row(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *result; + MYSQL_RES *mysql_result; + MYSQL_ROW mysql_row; + mysql_row_length_type *mysql_row_lengths; + int type; + int num_fields; + int i; + PLS_FETCH(); + + + if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) { + WRONG_PARAM_COUNT; + } + + convert_to_long(result); + mysql_result = (MYSQL_RES *) php3_list_find(result->value.lval,&type); + + if (type!=MySG(le_result)) { + php3_error(E_WARNING,"%d is not a MySQL result index",result->value.lval); + RETURN_FALSE; + } + if ((mysql_row=mysql_fetch_row(mysql_result))==NULL + || (mysql_row_lengths=mysql_fetch_lengths(mysql_result))==NULL) { + RETURN_FALSE; + } + if (array_init(return_value)==FAILURE) { + RETURN_FALSE; + } + num_fields = mysql_num_fields(mysql_result); + + for (i=0; i<num_fields; i++) { + if (mysql_row[i]) { + if (PG(magic_quotes_runtime)) { + int len; + char *tmp=_php3_addslashes(mysql_row[i],mysql_row_lengths[i],&len,0); + + add_index_stringl(return_value, i, tmp, len, 0); + } else { + add_index_stringl(return_value, i, mysql_row[i], mysql_row_lengths[i], 1); + } + } else { + /* NULL field, don't set it */ + /*add_index_stringl(return_value, i, empty_string, 0, 1);*/ + } + } +} +/* }}} */ + +static void php3_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *result; + MYSQL_RES *mysql_result; + MYSQL_ROW mysql_row; + MYSQL_FIELD *mysql_field; + mysql_row_length_type *mysql_row_lengths; + int type; + int num_fields; + int i; + pval *pval_ptr; + PLS_FETCH(); + + + if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) { + WRONG_PARAM_COUNT; + } + + convert_to_long(result); + mysql_result = (MYSQL_RES *) php3_list_find(result->value.lval,&type); + + if (type!=MySG(le_result)) { + php3_error(E_WARNING,"%d is not a MySQL result index",result->value.lval); + RETURN_FALSE; + } + if ((mysql_row=mysql_fetch_row(mysql_result))==NULL + || (mysql_row_lengths=mysql_fetch_lengths(mysql_result))==NULL) { + RETURN_FALSE; + } + + num_fields = mysql_num_fields(mysql_result); + + if (array_init(return_value)==FAILURE) { + RETURN_FALSE; + } + + mysql_field_seek(mysql_result,0); + for (mysql_field=mysql_fetch_field(mysql_result),i=0; mysql_field; mysql_field=mysql_fetch_field(mysql_result),i++) { + if (mysql_row[i]) { + if (PG(magic_quotes_runtime)) { + int len; + char *tmp=_php3_addslashes(mysql_row[i],mysql_row_lengths[i],&len,0); + + add_get_index_stringl(return_value, i, tmp, len, (void **) &pval_ptr, 0); + } else { + add_get_index_stringl(return_value, i, mysql_row[i], mysql_row_lengths[i], (void **) &pval_ptr, 1); + } + _php3_hash_pointer_update(return_value->value.ht, mysql_field->name, strlen(mysql_field->name)+1, pval_ptr); + } else { + /* NULL field, don't set it */ + /* add_get_index_stringl(return_value, i, empty_string, 0, (void **) &pval_ptr); */ + } + } +} + +/* {{{ proto object mysql_fetch_object(int result) + Fetch a result row as an object */ +void php3_mysql_fetch_object(INTERNAL_FUNCTION_PARAMETERS) +{ + php3_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU); + if (return_value->type==IS_ARRAY) { + return_value->type=IS_OBJECT; + } +} +/* }}} */ + +/* {{{ proto array mysql_fetch_array(int result) + Fetch a result row as an associative array */ +void php3_mysql_fetch_array(INTERNAL_FUNCTION_PARAMETERS) +{ + php3_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU); +} +/* }}} */ + +/* {{{ proto int mysql_data_seek(int result, int row_number) + Move internal result pointer */ +void php3_mysql_data_seek(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *result,*offset; + MYSQL_RES *mysql_result; + int type; + + + if (ARG_COUNT(ht)!=2 || getParameters(ht, 2, &result, &offset)==FAILURE) { + WRONG_PARAM_COUNT; + } + + convert_to_long(result); + mysql_result = (MYSQL_RES *) php3_list_find(result->value.lval,&type); + + if (type!=MySG(le_result)) { + php3_error(E_WARNING,"%d is not a MySQL result index",result->value.lval); + RETURN_FALSE; + } + convert_to_long(offset); + if (offset->value.lval<0 || offset->value.lval>=(int)mysql_num_rows(mysql_result)) { + php3_error(E_WARNING,"Offset %d is invalid for MySQL result index %d",offset->value.lval,result->value.lval); + RETURN_FALSE; + } + mysql_data_seek(mysql_result,offset->value.lval); + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto array mysql_fetch_lengths(int result) + Get max data size of each column in a result */ +void php3_mysql_fetch_lengths(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *result; + MYSQL_RES *mysql_result; + mysql_row_length_type *lengths; + int type; + int num_fields; + int i; + + + if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) { + WRONG_PARAM_COUNT; + } + + convert_to_long(result); + mysql_result = (MYSQL_RES *) php3_list_find(result->value.lval,&type); + + if (type!=MySG(le_result)) { + php3_error(E_WARNING,"%d is not a MySQL result index",result->value.lval); + RETURN_FALSE; + } + if ((lengths=mysql_fetch_lengths(mysql_result))==NULL) { + RETURN_FALSE; + } + if (array_init(return_value)==FAILURE) { + RETURN_FALSE; + } + num_fields = mysql_num_fields(mysql_result); + + for (i=0; i<num_fields; i++) { + add_index_long(return_value, i, lengths[i]); + } +} +/* }}} */ + +static char *php3_mysql_get_field_name(int field_type) +{ + switch(field_type) { + case FIELD_TYPE_STRING: + case FIELD_TYPE_VAR_STRING: + return "string"; + break; +#ifdef FIELD_TYPE_TINY + case FIELD_TYPE_TINY: +#endif + case FIELD_TYPE_SHORT: + case FIELD_TYPE_LONG: + case FIELD_TYPE_LONGLONG: + case FIELD_TYPE_INT24: + return "int"; + break; + case FIELD_TYPE_FLOAT: + case FIELD_TYPE_DOUBLE: + case FIELD_TYPE_DECIMAL: + return "real"; + break; + case FIELD_TYPE_TIMESTAMP: + return "timestamp"; + break; + case FIELD_TYPE_DATE: + return "date"; + break; + case FIELD_TYPE_TIME: + return "time"; + break; + case FIELD_TYPE_DATETIME: + return "datetime"; + break; + case FIELD_TYPE_TINY_BLOB: + case FIELD_TYPE_MEDIUM_BLOB: + case FIELD_TYPE_LONG_BLOB: + case FIELD_TYPE_BLOB: + return "blob"; + break; + case FIELD_TYPE_NULL: + return "null"; + break; + default: + return "unknown"; + break; + } +} + +/* {{{ proto object mysql_fetch_field(int result [, int field_offset]) + Get column information from a result and return as an object */ +void php3_mysql_fetch_field(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *result,*field=NULL; + MYSQL_RES *mysql_result; + MYSQL_FIELD *mysql_field; + int type; + + + switch (ARG_COUNT(ht)) { + case 1: + if (getParameters(ht, 1, &result)==FAILURE) { + RETURN_FALSE; + } + break; + case 2: + if (getParameters(ht, 2, &result, &field)==FAILURE) { + RETURN_FALSE; + } + convert_to_long(field); + break; + default: + WRONG_PARAM_COUNT; + } + + convert_to_long(result); + mysql_result = (MYSQL_RES *) php3_list_find(result->value.lval,&type); + + if (type!=MySG(le_result)) { + php3_error(E_WARNING,"%d is not a MySQL result index",result->value.lval); + RETURN_FALSE; + } + if (field) { + if (field->value.lval<0 || field->value.lval>=(int)mysql_num_fields(mysql_result)) { + php3_error(E_WARNING,"MySQL: Bad field offset"); + RETURN_FALSE; + } + mysql_field_seek(mysql_result,field->value.lval); + } + if ((mysql_field=mysql_fetch_field(mysql_result))==NULL) { + RETURN_FALSE; + } + if (object_init(return_value)==FAILURE) { + RETURN_FALSE; + } + + add_property_string(return_value, "name",(mysql_field->name?mysql_field->name:empty_string), 1); + add_property_string(return_value, "table",(mysql_field->table?mysql_field->table:empty_string), 1); + add_property_string(return_value, "def",(mysql_field->def?mysql_field->def:empty_string), 1); + 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(mysql_field->type)?1:0); + add_property_long(return_value, "blob",IS_BLOB(mysql_field->flags)?1:0); + add_property_string(return_value, "type",php3_mysql_get_field_name(mysql_field->type), 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)); +} +/* }}} */ + +/* {{{ proto int mysql_field_seek(int result, int field_offset) + Set result pointer to a specific field offset */ +void php3_mysql_field_seek(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *result, *offset; + MYSQL_RES *mysql_result; + int type; + + + if (ARG_COUNT(ht)!=2 || getParameters(ht, 2, &result, &offset)==FAILURE) { + WRONG_PARAM_COUNT; + } + + convert_to_long(result); + mysql_result = (MYSQL_RES *) php3_list_find(result->value.lval,&type); + + if (type!=MySG(le_result)) { + php3_error(E_WARNING,"%d is not a MySQL result index",result->value.lval); + RETURN_FALSE; + } + convert_to_long(offset); + if (offset->value.lval<0 || offset->value.lval>=(int)mysql_num_fields(mysql_result)) { + php3_error(E_WARNING,"Field %d is invalid for MySQL result index %d",offset->value.lval,result->value.lval); + RETURN_FALSE; + } + mysql_field_seek(mysql_result,offset->value.lval); + RETURN_TRUE; +} +/* }}} */ + +#define PHP3_MYSQL_FIELD_NAME 1 +#define PHP3_MYSQL_FIELD_TABLE 2 +#define PHP3_MYSQL_FIELD_LEN 3 +#define PHP3_MYSQL_FIELD_TYPE 4 +#define PHP3_MYSQL_FIELD_FLAGS 5 + +static void php3_mysql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) +{ + pval *result, *field; + MYSQL_RES *mysql_result; + MYSQL_FIELD *mysql_field; + int type; + char buf[512]; + int len; + + if (ARG_COUNT(ht)!=2 || getParameters(ht, 2, &result, &field)==FAILURE) { + WRONG_PARAM_COUNT; + } + + convert_to_long(result); + mysql_result = (MYSQL_RES *) php3_list_find(result->value.lval,&type); + + if (type!=MySG(le_result)) { + php3_error(E_WARNING,"%d is not a MySQL result index",result->value.lval); + RETURN_FALSE; + } + + convert_to_long(field); + if (field->value.lval<0 || field->value.lval>=(int)mysql_num_fields(mysql_result)) { + php3_error(E_WARNING,"Field %d is invalid for MySQL result index %d",field->value.lval,result->value.lval); + RETURN_FALSE; + } + mysql_field_seek(mysql_result,field->value.lval); + if ((mysql_field=mysql_fetch_field(mysql_result))==NULL) { + RETURN_FALSE; + } + + switch (entry_type) { + case PHP3_MYSQL_FIELD_NAME: + return_value->value.str.len = strlen(mysql_field->name); + return_value->value.str.val = estrndup(mysql_field->name,return_value->value.str.len); + return_value->type = IS_STRING; + break; + case PHP3_MYSQL_FIELD_TABLE: + return_value->value.str.len = strlen(mysql_field->table); + return_value->value.str.val = estrndup(mysql_field->table,return_value->value.str.len); + return_value->type = IS_STRING; + break; + case PHP3_MYSQL_FIELD_LEN: + return_value->value.lval = mysql_field->length; + return_value->type = IS_LONG; + break; + case PHP3_MYSQL_FIELD_TYPE: + return_value->value.str.val = php3_mysql_get_field_name(mysql_field->type); + return_value->value.str.len = strlen(return_value->value.str.val); + return_value->value.str.val = estrndup(return_value->value.str.val, return_value->value.str.len); + return_value->type = IS_STRING; + break; + case PHP3_MYSQL_FIELD_FLAGS: + strcpy(buf, ""); +#ifdef IS_NOT_NULL + if (IS_NOT_NULL(mysql_field->flags)) { + strcat(buf, "not_null "); + } +#endif +#ifdef IS_PRI_KEY + if (IS_PRI_KEY(mysql_field->flags)) { + strcat(buf, "primary_key "); + } +#endif +#ifdef UNIQUE_KEY_FLAG + if (mysql_field->flags&UNIQUE_KEY_FLAG) { + strcat(buf, "unique_key "); + } +#endif +#ifdef MULTIPLE_KEY_FLAG + if (mysql_field->flags&MULTIPLE_KEY_FLAG) { + strcat(buf, "multiple_key "); + } +#endif +#ifdef IS_BLOB + if (IS_BLOB(mysql_field->flags)) { + strcat(buf, "blob "); + } +#endif +#ifdef UNSIGNED_FLAG + if (mysql_field->flags&UNSIGNED_FLAG) { + strcat(buf, "unsigned "); + } +#endif +#ifdef ZEROFILL_FLAG + if (mysql_field->flags&ZEROFILL_FLAG) { + strcat(buf, "zerofill "); + } +#endif +#ifdef BINARY_FLAG + if (mysql_field->flags&BINARY_FLAG) { + strcat(buf, "binary "); + } +#endif +#ifdef ENUM_FLAG + if (mysql_field->flags&ENUM_FLAG) { + strcat(buf, "enum "); + } +#endif +#ifdef AUTO_INCREMENT_FLAG + if (mysql_field->flags&AUTO_INCREMENT_FLAG) { + strcat(buf, "auto_increment "); + } +#endif +#ifdef TIMESTAMP_FLAG + if (mysql_field->flags&TIMESTAMP_FLAG) { + strcat(buf, "timestamp "); + } +#endif + len = strlen(buf); + /* remove trailing space, if present */ + if (len && buf[len-1] == ' ') { + buf[len-1] = 0; + len--; + } + + return_value->value.str.len = len; + return_value->value.str.val = estrndup(buf, len); + return_value->type = IS_STRING; + break; + + default: + RETURN_FALSE; + } +} + +/* {{{ proto string mysql_field_name(int result, int field_index) + Get the name of the specified field in a result */ +void php3_mysql_field_name(INTERNAL_FUNCTION_PARAMETERS) +{ + php3_mysql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MYSQL_FIELD_NAME); +} +/* }}} */ + +/* {{{ proto string mysql_field_table(int result, int field_offset) + Get name of the table the specified field is in */ +void php3_mysql_field_table(INTERNAL_FUNCTION_PARAMETERS) +{ + php3_mysql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MYSQL_FIELD_TABLE); +} +/* }}} */ + +/* {{{ proto int mysql_field_len(int result, int field_offet) + Returns the length of the specified field */ +void php3_mysql_field_len(INTERNAL_FUNCTION_PARAMETERS) +{ + php3_mysql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MYSQL_FIELD_LEN); +} +/* }}} */ + +/* {{{ proto string mysql_field_type(int result, int field_offset) + Get the type of the specified field in a result */ +void php3_mysql_field_type(INTERNAL_FUNCTION_PARAMETERS) +{ + php3_mysql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MYSQL_FIELD_TYPE); +} +/* }}} */ + +/* {{{ proto string mysql_field_flags(int result, int field_offset) + Get the flags associated with the specified field in a result */ +void php3_mysql_field_flags(INTERNAL_FUNCTION_PARAMETERS) +{ + php3_mysql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MYSQL_FIELD_FLAGS); +} +/* }}} */ + +/* {{{ proto int mysql_free_result(int result) + Free result memory */ +void php3_mysql_free_result(INTERNAL_FUNCTION_PARAMETERS) +{ + pval *result; + MYSQL_RES *mysql_result; + int type; + + if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) { + WRONG_PARAM_COUNT; + } + + convert_to_long(result); + if (result->value.lval==0) { + RETURN_FALSE; + } + + mysql_result = (MYSQL_RES *) php3_list_find(result->value.lval,&type); + + if (type!=MySG(le_result)) { + php3_error(E_WARNING,"%d is not a MySQL result index",result->value.lval); + RETURN_FALSE; + } + php3_list_delete(result->value.lval); + RETURN_TRUE; +} +/* }}} */ +#endif + + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + */ diff --git a/ext/mysql/php3_mysql.h b/ext/mysql/php3_mysql.h new file mode 100644 index 0000000000..403e714596 --- /dev/null +++ b/ext/mysql/php3_mysql.h @@ -0,0 +1,120 @@ +/* + +----------------------------------------------------------------------+ + | PHP HTML Embedded Scripting Language Version 3.0 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997,1998 PHP Development Team (See Credits file) | + +----------------------------------------------------------------------+ + | This program is free software; you can redistribute it and/or modify | + | it under the terms of one of the following licenses: | + | | + | A) the GNU General Public License as published by the Free Software | + | Foundation; either version 2 of the License, or (at your option) | + | any later version. | + | | + | B) the PHP License as published by the PHP Development Team and | + | included in the distribution in the file: LICENSE | + | | + | This program is distributed in the hope that it will be useful, | + | but WITHOUT ANY WARRANTY; without even the implied warranty of | + | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | + | GNU General Public License for more details. | + | | + | You should have received a copy of both licenses referred to here. | + | If you did not, or have any questions about PHP licensing, please | + | contact core@php.net. | + +----------------------------------------------------------------------+ + | Authors: Zeev Suraski <zeev@zend.com> | + +----------------------------------------------------------------------+ + */ + + +/* $Id$ */ + +#ifndef _PHP3_MYSQL_H +#define _PHP3_MYSQL_H + +#if COMPILE_DL +#undef HAVE_MYSQL +#define HAVE_MYSQL 1 +#endif + +#if HAVE_MYSQL +#ifndef DLEXPORT +#define DLEXPORT +#endif + +extern php3_module_entry mysql_module_entry; +#define mysql_module_ptr &mysql_module_entry + +extern int php3_minit_mysql(INIT_FUNC_ARGS); +extern int php3_rinit_mysql(INIT_FUNC_ARGS); +extern int php3_mshutdown_mysql(SHUTDOWN_FUNC_ARGS); +extern void php3_info_mysql(void); +extern void php3_mysql_connect(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_pconnect(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_close(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_select_db(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_create_db(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_drop_db(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_query(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_db_query(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_list_dbs(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_list_tables(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_list_fields(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_error(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_errno(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_affected_rows(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_insert_id(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_result(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_num_rows(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_num_fields(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_fetch_row(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_fetch_array(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_fetch_object(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_data_seek(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_fetch_lengths(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_fetch_field(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_field_seek(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_free_result(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_field_name(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_field_table(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_field_len(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_field_type(INTERNAL_FUNCTION_PARAMETERS); +extern void php3_mysql_field_flags(INTERNAL_FUNCTION_PARAMETERS); + +typedef struct { + long default_link; + long num_links,num_persistent; + long max_links,max_persistent; + long allow_persistent; + int le_result,le_link,le_plink; + long default_port; + char *default_host, *default_user, *default_password; +} php_mysql_globals; + + +#ifdef ZTS +# define MySLS_D php_mysql_globals *mysql_globals +# define MySLS_DC , MySLS_D +# define MySLS_C mysql_globals +# define MySLS_CC , MySLS_C +# define MySG(v) (mysql_globals->v) +# define MySLS_FETCH() php_mysql_globals *mysql_globals = ts_resource(mysql_globals_id) +#else +# define MySLS_D +# define MySLS_DC +# define MySLS_C +# define MySLS_CC +# define MySG(v) (mysql_globals.v) +# define MySLS_FETCH() +extern ZEND_API php_mysql_globals mysql_globals; +#endif + + +#else + +#define mysql_module_ptr NULL + +#endif + +#endif /* _PHP3_MYSQL_H */ diff --git a/ext/mysql/setup.stub b/ext/mysql/setup.stub new file mode 100644 index 0000000000..5297b00082 --- /dev/null +++ b/ext/mysql/setup.stub @@ -0,0 +1,6 @@ +# $Id$ + +define_option with-mysql 'mysql support?' yesnodir \ + "defs" \ +' Whether to include mysql support.' + diff --git a/internal_functions.c b/internal_functions.c index 03c99ea7b1..c75fe2ec4e 100644 --- a/internal_functions.c +++ b/internal_functions.c @@ -49,7 +49,7 @@ #include "functions/php3_ifx.h" #include "functions/php3_crypt.h" #include "functions/php3_ldap.h" -#include "functions/php3_mysql.h" +#include "ext/mysql/php3_mysql.h" #include "functions/php3_bcmath.h" #include "functions/php3_msql.h" #include "functions/php3_oci8.h" |