This commit was manufactured by cvs2svn to create branch 'PHP_4_3'.

4 files changed, 731 insertions, 0 deletions

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
new file mode 100644
index 0000000000..f5b856c08c
--- /dev/null
+++ b/ext/mysqli/mysqli.c
@@ -0,0 +1,451 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 5                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2003 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | This source file is subject to version 2.02 of the PHP license,      |
+  | that is bundled with this package in the file LICENSE, and is        |
+  | available at through the world-wide-web at                           |
+  | http://www.php.net/license/2_02.txt.                                 |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | obtain it through the world-wide-web, please send a note to          |
+  | license@php.net so we can mail you a copy immediately.               |
+  +----------------------------------------------------------------------+
+  | Author: Georg Richter <georg@php.net>                                |
+  +----------------------------------------------------------------------+
+
+  $Id$ 
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <signal.h>
+
+#include "php.h"
+#include "php_ini.h"
+#include "ext/standard/info.h"
+#include "ext/standard/php_string.h"
+#include "php_mysqli.h"
+
+#define MYSQLI_STORE_RESULT 0
+#define MYSQLI_USE_RESULT 1
+
+ZEND_DECLARE_MODULE_GLOBALS(mysqli)
+static zend_object_handlers mysqli_object_handlers;
+PR_MAIN *prmain;
+
+/* {{{ php_clear_stmt_bind */
+void php_clear_stmt_bind(STMT *stmt)
+{
+	unsigned int i;
+
+	if (stmt->stmt) {
+		mysql_stmt_close(stmt->stmt);
+	}
+
+	if (stmt->var_cnt) {
+		for (i = 0; i < stmt->var_cnt; i++) {
+			if (stmt->type == FETCH_RESULT) {
+				if (stmt->bind[i].type == IS_STRING) {
+					efree(stmt->bind[i].buffer);
+				}
+			}
+			if (stmt->vars[i]) {	
+				ZVAL_DELREF(stmt->vars[i]);
+			}
+		}
+		if (stmt->type == FETCH_RESULT) {
+			efree(stmt->bind);
+		}
+		efree(stmt->vars);
+		efree(stmt->is_null);
+	}
+	efree(stmt);
+	return;
+}
+/* }}} */
+
+/* {{{ mysqli_objects_dtor
+ */
+static void mysqli_objects_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+{
+	mysqli_object 	*intern = (mysqli_object *)object;
+	MYSQLI_RESOURCE	*my_res = (MYSQLI_RESOURCE *)intern->ptr;
+
+	/* link object */
+	if (intern->zo.ce == mysqli_link_class_entry) {
+		if (my_res && my_res->ptr) {
+			mysql_close(my_res->ptr);
+		}
+	} else if (intern->zo.ce == mysqli_stmt_class_entry) { /* stmt object */
+		if (my_res && my_res->ptr) {
+			php_clear_stmt_bind((STMT *)my_res->ptr);
+		}
+	} else if (intern->zo.ce == mysqli_result_class_entry) { /* result object */
+		if (my_res && my_res->ptr) {
+			mysql_free_result(my_res->ptr);
+		}
+	}
+	my_efree(my_res);
+	zend_objects_destroy_object(object, handle TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ mysqli_objects_clone
+ */
+static void mysqli_objects_clone(void *object, void **object_clone TSRMLS_DC)
+{
+	/* TODO */
+}
+/* }}} */
+	
+/* {{{ mysqli_objects_new
+ */
+PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_type TSRMLS_DC)
+{
+	zend_object_value retval;
+	mysqli_object *intern;
+	zval *tmp;
+
+	intern = emalloc(sizeof(mysqli_object));
+	intern->zo.ce = class_type;
+	intern->zo.in_get = 0;
+	intern->zo.in_set = 0;
+	intern->ptr = NULL;
+
+	ALLOC_HASHTABLE(intern->zo.properties);
+	zend_hash_init(intern->zo.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+	zend_hash_copy(intern->zo.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+
+	retval.handle = zend_objects_store_put(intern, mysqli_objects_dtor, mysqli_objects_clone TSRMLS_CC);
+	retval.handlers = &mysqli_object_handlers;
+
+	return retval;
+}
+/* }}} */
+	
+/* {{{ mysqli_module_entry
+ */
+zend_module_entry mysqli_module_entry = {
+#if ZEND_MODULE_API_NO >= 20010901
+	STANDARD_MODULE_HEADER,
+#endif
+	"mysqli",
+	mysqli_functions,
+	PHP_MINIT(mysqli),
+	PHP_MSHUTDOWN(mysqli),
+	PHP_RINIT(mysqli),		/* Replace with NULL if there's nothing to do at request start */
+	PHP_RSHUTDOWN(mysqli),	/* Replace with NULL if there's nothing to do at request end */
+	PHP_MINFO(mysqli),
+#if ZEND_MODULE_API_NO >= 20010901
+	"0.1", /* Replace with version number for your extension */
+#endif
+	STANDARD_MODULE_PROPERTIES
+};
+/* }}} */
+
+#ifdef COMPILE_DL_MYSQLI
+ZEND_GET_MODULE(mysqli)
+#endif
+
+/* {{{ PHP_INI_BEGIN
+*/
+PHP_INI_BEGIN()
+	STD_PHP_INI_ENTRY_EX("mysqli.max_links",			"-1",	PHP_INI_SYSTEM,		OnUpdateLong,		max_links,			zend_mysqli_globals,		mysqli_globals, display_link_numbers)
+	STD_PHP_INI_ENTRY("mysqli.default_host",			NULL,	PHP_INI_ALL,		OnUpdateString,		default_host,		zend_mysqli_globals,		mysqli_globals)
+	STD_PHP_INI_ENTRY("mysqli.default_user",			NULL,	PHP_INI_ALL,		OnUpdateString,		default_user,		zend_mysqli_globals,		mysqli_globals)
+	STD_PHP_INI_ENTRY("mysqli.default_pw",				NULL,	PHP_INI_ALL,		OnUpdateString,		default_pw,			zend_mysqli_globals,		mysqli_globals)
+	STD_PHP_INI_ENTRY("mysqli.default_port",			"3306",	PHP_INI_ALL,		OnUpdateLong,		default_port,		zend_mysqli_globals,		mysqli_globals)
+	STD_PHP_INI_ENTRY("mysqli.default_socket",			NULL,	PHP_INI_ALL,		OnUpdateStringUnempty,	default_socket,	zend_mysqli_globals,		mysqli_globals)
+PHP_INI_END()
+
+/* }}} */
+
+/* {{{ php_mysqli_init_globals
+ */
+static void php_mysqli_init_globals(zend_mysqli_globals *mysqli_globals)
+{
+	mysqli_globals->num_links = 0;
+	mysqli_globals->max_links = 0;
+	mysqli_globals->default_port = 0;
+	mysqli_globals->default_host = NULL;
+	mysqli_globals->default_user = NULL;
+	mysqli_globals->default_pw = NULL;
+	mysqli_globals->default_socket = NULL;
+	mysqli_globals->profiler = 0;
+}
+/* }}} */
+
+/* {{{ PHP_MINIT_FUNCTION
+ */
+PHP_MINIT_FUNCTION(mysqli)
+{
+	
+	ZEND_INIT_MODULE_GLOBALS(mysqli, php_mysqli_init_globals, NULL);
+	REGISTER_INI_ENTRIES();
+
+	memcpy(&mysqli_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+	mysqli_object_handlers.clone_obj = zend_objects_store_clone_obj;
+
+	REGISTER_MYSQLI_CLASS_ENTRY("mysqli", mysqli_link_class_entry, mysqli_link_methods);
+	REGISTER_MYSQLI_CLASS_ENTRY("mysqli_result", mysqli_result_class_entry, mysqli_result_methods);
+	REGISTER_MYSQLI_CLASS_ENTRY("mysqli_stmt", mysqli_stmt_class_entry, mysqli_stmt_methods);
+	
+	/* mysqli_options */
+	REGISTER_LONG_CONSTANT("MYSQLI_READ_DEFAULT_GROUP", MYSQL_READ_DEFAULT_GROUP, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_READ_DEFAULT_FILE", MYSQL_READ_DEFAULT_FILE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_OPT_CONNECT_TIMEOUT", MYSQL_OPT_CONNECT_TIMEOUT, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_OPT_LOCAL_INFILE", MYSQL_OPT_LOCAL_INFILE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_INIT_COMMAND", MYSQL_INIT_COMMAND, CONST_CS | CONST_PERSISTENT);
+
+	/* mysqli_real_connect flags */	
+	REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_SSL", CLIENT_SSL, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_COMPRESS",CLIENT_COMPRESS, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_INTERACTIVE", CLIENT_INTERACTIVE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_IGNORE_SPACE", CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_NO_SCHEMA", CLIENT_NO_SCHEMA, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_MULTI_QUERIES", CLIENT_MULTI_QUERIES, CONST_CS | CONST_PERSISTENT);
+	
+
+	/* for mysqli_query */
+	REGISTER_LONG_CONSTANT("MYSQLI_STORE_RESULT", 0, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_USE_RESULT", 1, CONST_CS | CONST_PERSISTENT);
+
+	/* for mysqli_fetch_assoc */
+	REGISTER_LONG_CONSTANT("MYSQLI_ASSOC", MYSQLI_ASSOC, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_NUM", MYSQLI_NUM, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_BOTH", MYSQLI_BOTH, CONST_CS | CONST_PERSISTENT);
+	
+	
+	/* column information */
+	REGISTER_LONG_CONSTANT("MYSQLI_NOT_NULL_FLAG", NOT_NULL_FLAG, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_PRI_KEY_FLAG", PRI_KEY_FLAG, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_UNIQUE_KEY_FLAG", UNIQUE_KEY_FLAG, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_MULTIPLE_KEY_FLAG", MULTIPLE_KEY_FLAG, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_BLOB_FLAG", BLOB_FLAG, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_UNSIGNED_FLAG", UNSIGNED_FLAG, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_ZEROFILL_FLAG", ZEROFILL_FLAG, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_AUTO_INCREMENT_FLAG", AUTO_INCREMENT_FLAG, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TIMESTAMP_FLAG", TIMESTAMP_FLAG, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_SET_FLAG", SET_FLAG, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_NUM_FLAG", NUM_FLAG, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_PART_KEY_FLAG", PART_KEY_FLAG, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_GROUP_FLAG", GROUP_FLAG, CONST_CS | CONST_PERSISTENT);
+
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_DECIMAL", FIELD_TYPE_DECIMAL, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_TINY", FIELD_TYPE_TINY, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_SHORT", FIELD_TYPE_SHORT, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_LONG", FIELD_TYPE_LONG, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_FLOAD", FIELD_TYPE_FLOAT, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_DOUBLE", FIELD_TYPE_DOUBLE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_NULL", FIELD_TYPE_NULL, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_TIMESTAMP", FIELD_TYPE_TIMESTAMP, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_LONGLONG", FIELD_TYPE_LONGLONG, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_INT24", FIELD_TYPE_INT24, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_DATE", FIELD_TYPE_DATE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_TIME", FIELD_TYPE_TIME, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_DATETIME", FIELD_TYPE_DATETIME	, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_YEAR", FIELD_TYPE_YEAR, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_NEWDATE", FIELD_TYPE_NEWDATE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_ENUM", FIELD_TYPE_ENUM, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_SET", FIELD_TYPE_SET, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_TINY_BLOB", FIELD_TYPE_TINY_BLOB, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_MEDIUM_BLOB", FIELD_TYPE_MEDIUM_BLOB, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_LONG_BLOB", FIELD_TYPE_LONG_BLOB, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_BLOB", FIELD_TYPE_BLOB, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_VAR_STRING", FIELD_TYPE_VAR_STRING, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_STRING", FIELD_TYPE_STRING, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_CHAR", FIELD_TYPE_CHAR, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_INTERVAL", FIELD_TYPE_INTERVAL, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_GEOMETRY", FIELD_TYPE_GEOMETRY, CONST_CS | CONST_PERSISTENT);
+
+	/* bindtypes for mysqli_bind_result */
+	REGISTER_LONG_CONSTANT("MYSQLI_BIND_STRING", MYSQLI_BIND_STRING, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_BIND_INT", MYSQLI_BIND_INT, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_BIND_DOUBLE", MYSQLI_BIND_DOUBLE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_BIND_SEND_DATA", MYSQLI_BIND_SEND_DATA, CONST_CS | CONST_PERSISTENT);
+
+	/* replication */
+	REGISTER_LONG_CONSTANT("MYSQLI_RPL_MASTER", MYSQL_RPL_MASTER, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_RPL_SLAVE", MYSQL_RPL_SLAVE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_RPL_ADMIN", MYSQL_RPL_ADMIN, CONST_CS | CONST_PERSISTENT);
+	
+	/* bind blob support */
+	REGISTER_LONG_CONSTANT("MYSQLI_NEED_DATA", MYSQL_NEED_DATA, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_NO_DATA", MYSQL_NO_DATA, CONST_CS | CONST_PERSISTENT);
+
+	/* profiler support */
+	REGISTER_LONG_CONSTANT("MYSQLI_PR_REPORT_STDERR", 1, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_PR_REPORT_PORT", 2, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_PR_REPORT_FILE", 3, CONST_CS | CONST_PERSISTENT);
+
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_MSHUTDOWN_FUNCTION
+ */
+PHP_MSHUTDOWN_FUNCTION(mysqli)
+{
+	/* uncomment this line if you have INI entries
+	UNREGISTER_INI_ENTRIES();
+	*/
+	return SUCCESS;
+}
+/* }}} */
+
+/* Remove if there's nothing to do at request start */
+/* {{{ PHP_RINIT_FUNCTION
+ */
+PHP_RINIT_FUNCTION(mysqli)
+{
+	MyG(error_msg) = NULL;
+	MyG(error_no) = 0;
+
+	return SUCCESS;
+}
+/* }}} */
+
+/* Remove if there's nothing to do at request end */
+/* {{{ PHP_RSHUTDOWN_FUNCTION
+ */
+PHP_RSHUTDOWN_FUNCTION(mysqli)
+{
+	if (MyG(error_msg)) {
+		efree(MyG(error_msg));
+	}
+
+	if (MyG(profiler)) {
+		if (prmain->header.child) {
+			php_mysqli_profiler_report((PR_COMMON *)prmain, 0);
+		}
+		switch (prmain->mode) {
+			case MYSQLI_PR_REPORT_FILE:
+				fclose(prmain->fp);
+				efree(prmain->name);
+			break;
+		}
+	}
+
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_MINFO_FUNCTION
+ */
+PHP_MINFO_FUNCTION(mysqli)
+{
+	php_info_print_table_start();
+	php_info_print_table_header(2, "MysqlI Support", "enabled");
+	php_info_print_table_row(2, "Client API version", mysql_get_client_info());
+	php_info_print_table_row(2, "MYSQLI_SOCKET", MYSQL_UNIX_ADDR);
+	
+	
+	php_info_print_table_end();
+
+	DISPLAY_INI_ENTRIES();
+}
+/* }}} */
+
+/* {{{ php_mysqli_fetch_into_hash
+ */
+void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags)
+{
+	MYSQL_RES		*result;
+	zval			*mysql_result;
+	int				fetchtype;
+	int				copyflag;
+	unsigned int	i;
+	MYSQL_FIELD		*fields;
+	MYSQL_ROW		row;
+	unsigned long	*field_len;
+	PR_RESULT		*prresult;
+	PR_COMMAND		*prcommand;
+
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|l", &mysql_result, mysqli_result_class_entry, &fetchtype) == FAILURE) {
+		return;
+	}
+
+	if (ZEND_NUM_ARGS() < 2 && !override_flags) {
+		fetchtype = MYSQLI_BOTH;
+	}
+
+	if (override_flags) {
+		fetchtype = override_flags;
+	}
+
+	MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, prresult, PR_RESULT *, &mysql_result, "mysqli_result"); 
+
+	MYSQLI_PROFILER_COMMAND_START(prcommand, prresult);
+
+	fields = mysql_fetch_fields(result);
+	if (!(row = mysql_fetch_row(result))) {
+		RETURN_FALSE;
+	}
+
+	array_init(return_value);
+	field_len = mysql_fetch_lengths(result);
+
+	for (i = 0; i < mysql_num_fields(result); i++) {
+		if (row[i]) {
+			char	*column;
+			int	 column_len;
+			
+			/* check if we need magic quotes */
+			if (PG(magic_quotes_runtime)) {
+				column = php_addslashes(row[i], field_len[i], &column_len, 0 TSRMLS_CC);
+				copyflag = 0;
+			} else {
+				column = row[i];
+				column_len = field_len[i];
+				copyflag = 1;
+			}
+			if (fetchtype & MYSQLI_NUM) {
+				add_index_stringl(return_value, i, column, column_len, copyflag);
+				copyflag = 1;	
+			}
+			if (fetchtype & MYSQLI_ASSOC) {
+				add_assoc_stringl(return_value, fields[i].name, column, column_len, copyflag); 
+			}
+		} else {
+			if (fetchtype & MYSQLI_NUM) {
+				add_index_null(return_value, i);
+			}
+			if (fetchtype & MYSQLI_ASSOC) {
+				add_assoc_null(return_value, fields[i].name);
+			}
+		}
+	}
+
+	if (MyG(profiler)) {
+		char tmp[10];
+		sprintf ((char *)&tmp,"row[%d]", mysql_num_fields(result));
+		MYSQLI_PROFILER_COMMAND_RETURNSTRING(prcommand, tmp);
+		prresult->fetched_rows++;
+	}
+}
+/* }}} */
+
+/* {{{ php_mysqli_set_error
+ */
+PHP_MYSQLI_API void php_mysqli_set_error(long mysql_errno, char *mysql_err TSRMLS_DC)
+{
+	MyG(error_no) = mysql_errno;
+	if (MyG(error_msg)) {
+		efree(MyG(error_msg));
+	}
+	MyG(error_msg) = estrdup(mysql_err);
+}
+/* }}} */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
new file mode 100644
index 0000000000..82e4a681b2
--- /dev/null
+++ b/ext/mysqli/mysqli_fe.c
@@ -0,0 +1,235 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 4                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2002 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | This source file is subject to version 2.02 of the PHP license,      |
+  | that is bundled with this package in the file LICENSE, and is        |
+  | available at through the world-wide-web at                           |
+  | http://www.php.net/license/2_02.txt.                                 |
+  | If you did not receive a copy of the PHP license and are unable to   |
+  | obtain it through the world-wide-web, please send a note to          |
+  | license@php.net so we can mail you a copy immediately.               |
+  +----------------------------------------------------------------------+
+  | Author: Georg Richter <georg@php.net>                                |
+  +----------------------------------------------------------------------+
+
+  $Id$ 
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <signal.h>
+
+#include "php.h"
+#include "php_ini.h"
+#include "ext/standard/info.h"
+#include "php_mysqli.h"
+
+
+/* {{{ mysqli_functions[]
+ *
+ * Every user visible function must have an entry in mysqli_functions[].
+ */
+function_entry mysqli_functions[] = {
+	PHP_FE(mysqli_affected_rows,						NULL)
+	PHP_FE(mysqli_autocommit,							NULL)
+	PHP_FE(mysqli_bind_param,							NULL)
+	PHP_FE(mysqli_bind_result,							NULL)
+	PHP_FE(mysqli_change_user,							NULL)
+	PHP_FE(mysqli_character_set_name,					NULL)
+	PHP_FALIAS(mysqli_client_encoding, 
+			   mysqli_character_set_name,				NULL)
+	PHP_FE(mysqli_close,								NULL)
+	PHP_FE(mysqli_commit,								NULL)
+	PHP_FE(mysqli_connect, 								NULL)
+	PHP_FE(mysqli_data_seek,							NULL)
+	PHP_FE(mysqli_debug,								NULL)
+	PHP_FE(mysqli_disable_reads_from_master,			NULL)
+	PHP_FE(mysqli_disable_rpl_parse,					NULL)
+	PHP_FE(mysqli_dump_debug_info,						NULL)
+	PHP_FE(mysqli_enable_reads_from_master,				NULL)
+	PHP_FE(mysqli_enable_rpl_parse,						NULL)
+	PHP_FE(mysqli_errno,								NULL)
+	PHP_FE(mysqli_error,								NULL)
+	PHP_FE(mysqli_execute,								NULL)
+	PHP_FE(mysqli_fetch,								NULL)
+	PHP_FE(mysqli_fetch_field,							NULL)
+	PHP_FE(mysqli_fetch_fields,							NULL)
+	PHP_FE(mysqli_fetch_field_direct,					NULL)
+	PHP_FE(mysqli_fetch_lengths,						NULL)
+	PHP_FE(mysqli_fetch_array,							NULL)
+	PHP_FE(mysqli_fetch_assoc,							NULL) 
+	PHP_FE(mysqli_fetch_object,							NULL) 
+	PHP_FE(mysqli_fetch_row,							NULL)
+	PHP_FE(mysqli_field_count,							NULL)
+	PHP_FE(mysqli_field_seek,							NULL)
+	PHP_FE(mysqli_field_tell,							NULL)
+	PHP_FE(mysqli_free_result,							NULL)
+	PHP_FE(mysqli_get_client_info,						NULL)
+	PHP_FE(mysqli_get_host_info,						NULL)
+	PHP_FE(mysqli_get_proto_info,						NULL)
+	PHP_FE(mysqli_get_server_info,						NULL)
+	PHP_FE(mysqli_get_server_version,					NULL)
+	PHP_FE(mysqli_init, 								NULL)
+	PHP_FE(mysqli_info,									NULL)
+	PHP_FE(mysqli_insert_id,							NULL)
+	PHP_FE(mysqli_kill,									NULL)
+	PHP_FE(mysqli_master_query,							NULL)
+	PHP_FE(mysqli_num_fields,							NULL)
+	PHP_FE(mysqli_num_rows,								NULL)
+	PHP_FE(mysqli_options, 								NULL)
+	PHP_FE(mysqli_param_count,							NULL)
+	PHP_FE(mysqli_ping,									NULL)
+	PHP_FE(mysqli_prepare,								NULL)
+	PHP_FE(mysqli_prepare_result,						NULL)
+	PHP_FE(mysqli_profiler,								NULL)
+	PHP_FE(mysqli_query,								NULL)
+	PHP_FE(mysqli_read_query_result,					NULL)
+	PHP_FE(mysqli_real_connect,							NULL)
+	PHP_FE(mysqli_real_escape_string,					NULL)
+	PHP_FALIAS(mysqli_escape_string, 
+				mysqli_real_escape_string,				NULL)
+	PHP_FE(mysqli_real_query,							NULL)
+	PHP_FE(mysqli_reload,								NULL)
+	PHP_FE(mysqli_rollback,								NULL)
+	PHP_FE(mysqli_rpl_parse_enabled,					NULL)
+	PHP_FE(mysqli_rpl_probe,							NULL)
+	PHP_FE(mysqli_rpl_query_type,						NULL)
+	PHP_FE(mysqli_select_db,							NULL)
+	PHP_FE(mysqli_send_long_data,						NULL)
+	PHP_FE(mysqli_send_query,							NULL)
+	PHP_FALIAS(mysqli_set_opt, 		mysqli_options, 	NULL)
+	PHP_FE(mysqli_slave_query,							NULL)
+	PHP_FE(mysqli_ssl_set,								NULL)
+	PHP_FE(mysqli_stat,									NULL)
+	PHP_FE(mysqli_stmt_affected_rows,					NULL)
+	PHP_FE(mysqli_stmt_close,							NULL)
+	PHP_FE(mysqli_stmt_errno,							NULL)
+	PHP_FE(mysqli_stmt_error,							NULL)
+	PHP_FE(mysqli_store_result,							NULL)
+	PHP_FE(mysqli_stmt_store_result,					NULL)
+	PHP_FE(mysqli_thread_id,							NULL)
+	PHP_FE(mysqli_thread_safe,							NULL)
+	PHP_FE(mysqli_use_result,							NULL)
+	PHP_FE(mysqli_warning_count,						NULL)
+	{NULL, NULL, NULL}	/* Must be the last line in mysqli_functions[] */
+};
+/* }}} */
+
+/* {{{ mysqli_link_methods[]
+ *
+ * Every user visible function must have an entry in mysqli_functions[].
+ */
+function_entry mysqli_link_methods[] = {
+	PHP_FALIAS(affected_rows,mysqli_affected_rows,NULL)
+	PHP_FALIAS(autocommit,mysqli_autocommit,NULL)
+	PHP_FALIAS(change_user,mysqli_change_user,NULL)
+	PHP_FALIAS(character_set_name,mysqli_character_set_name,NULL)
+	PHP_FALIAS(client_encoding, mysqli_character_set_name,NULL)
+	PHP_FALIAS(close,mysqli_close,NULL)
+	PHP_FALIAS(commit,mysqli_commit,NULL)
+	PHP_FALIAS(connect,mysqli_connect,NULL)
+	PHP_FALIAS(debug,mysqli_debug,NULL)
+	PHP_FALIAS(disable_reads_from_master,mysqli_disable_reads_from_master,NULL)
+	PHP_FALIAS(disable_rpl_parse,mysqli_disable_rpl_parse,NULL)
+	PHP_FALIAS(dump_debug_info,mysqli_dump_debug_info,NULL)
+	PHP_FALIAS(enable_reads_from_master,mysqli_enable_reads_from_master,NULL)
+	PHP_FALIAS(enable_rpl_parse,mysqli_enable_rpl_parse,NULL)
+	PHP_FALIAS(errno,mysqli_errno,NULL)
+	PHP_FALIAS(error,mysqli_error,NULL)
+	PHP_FALIAS(get_client_info,mysqli_get_client_info,NULL)
+	PHP_FALIAS(get_host_info,mysqli_get_host_info,NULL)
+	PHP_FALIAS(get_proto_info,mysqli_get_proto_info,NULL)
+	PHP_FALIAS(get_server_info,mysqli_get_server_info,NULL)
+	PHP_FALIAS(get_server_version,mysqli_get_server_version,NULL)
+	PHP_FALIAS(init,mysqli_init,NULL)
+	PHP_FALIAS(info,mysqli_info,NULL)
+	PHP_FALIAS(insert_id,mysqli_insert_id,NULL)
+	PHP_FALIAS(kill,mysqli_kill,NULL)
+	PHP_FALIAS(master_query,mysqli_master_query,NULL)
+	PHP_FALIAS(options,mysqli_options,NULL)
+	PHP_FALIAS(ping,mysqli_ping,NULL)
+	PHP_FALIAS(prepare,mysqli_prepare,NULL)
+	PHP_FALIAS(query,mysqli_query,NULL)
+	PHP_FALIAS(read_query_result,mysqli_read_query_result,NULL)
+	PHP_FALIAS(real_connect,mysqli_real_connect,NULL)
+	PHP_FALIAS(real_escape_string,mysqli_real_escape_string,NULL)
+	PHP_FALIAS(escape_string, mysqli_real_escape_string,NULL)
+	PHP_FALIAS(real_query,mysqli_real_query,NULL)
+	PHP_FALIAS(reload,mysqli_reload,NULL)
+	PHP_FALIAS(rollback,mysqli_rollback,NULL)
+	PHP_FALIAS(rpl_parse_enabled,mysqli_rpl_parse_enabled,NULL)
+	PHP_FALIAS(rpl_probe,mysqli_rpl_probe,NULL)
+	PHP_FALIAS(rpl_query_type,mysqli_rpl_query_type,NULL)
+	PHP_FALIAS(select_db,mysqli_select_db,NULL)
+	PHP_FALIAS(set_opt, mysqli_options,NULL)
+	PHP_FALIAS(slave_query,mysqli_slave_query,NULL)
+	PHP_FALIAS(ssl_set,mysqli_ssl_set,NULL)
+	PHP_FALIAS(stat,mysqli_stat,NULL)
+	PHP_FALIAS(store_result,mysqli_store_result,NULL)
+	PHP_FALIAS(thread_id, mysqli_thread_id,NULL)
+	PHP_FALIAS(thread_safe,mysqli_thread_safe,NULL)
+	PHP_FALIAS(use_result,mysqli_use_result,NULL)
+	PHP_FALIAS(warning_count,mysqli_warning_count,NULL)
+	{NULL, NULL, NULL}
+};
+/* }}} */
+
+/* {{{ mysqli_result_methods[]
+ *
+ * Every user visible function must have an entry in mysqli_result_functions[].
+ */
+function_entry mysqli_result_methods[] = {
+	PHP_FALIAS(close,mysqli_free_result,NULL)
+	PHP_FALIAS(free,mysqli_free_result,NULL)
+	PHP_FALIAS(data_seek,mysqli_data_seek,NULL)
+	PHP_FALIAS(fetch_field,mysqli_fetch_field,NULL)
+	PHP_FALIAS(fetch_fields,mysqli_fetch_fields,NULL)
+	PHP_FALIAS(fetvh_field_direct,mysqli_fetch_field_direct,NULL)
+	PHP_FALIAS(fetch_lengths,mysqli_fetch_lengths,NULL)
+	PHP_FALIAS(fetch_array,mysqli_fetch_array,NULL)
+	PHP_FALIAS(fetch_assoc,mysqli_fetch_assoc,NULL) 
+	PHP_FALIAS(fetch_object,mysqli_fetch_object,NULL) 
+	PHP_FALIAS(fetch_row,mysqli_fetch_row,NULL)
+	PHP_FALIAS(field_count,mysqli_field_count,NULL)
+	PHP_FALIAS(field_seek,mysqli_field_seek,NULL)
+	PHP_FALIAS(field_tell,mysqli_field_tell,NULL)
+	PHP_FALIAS(free_result,mysqli_free_result,NULL)
+	PHP_FALIAS(num_fields,mysqli_num_fields,NULL)
+	PHP_FALIAS(num_rows,mysqli_num_rows,NULL)
+	{NULL, NULL, NULL}
+};
+/* }}} */
+
+/* {{{ mysqli_stmt_methods[]
+ *
+ * Every user visible function must have an entry in mysqli_stmt_functions[].
+ */
+function_entry mysqli_stmt_methods[] = {
+	PHP_FALIAS(affected_rows,mysqli_stmt_affected_rows,NULL)
+	PHP_FALIAS(bind_param,mysqli_bind_param,NULL)
+	PHP_FALIAS(bind_result,mysqli_bind_result,NULL)
+	PHP_FALIAS(execute,mysqli_execute,NULL)
+	PHP_FALIAS(fetch,mysqli_fetch,NULL)
+	PHP_FALIAS(param_count,mysqli_param_count,NULL)
+	PHP_FALIAS(send_long_data,mysqli_send_long_data,NULL)
+	PHP_FALIAS(store_result,mysqli_stmt_store_result,NULL)
+	PHP_FALIAS(close,mysqli_stmt_close,NULL)
+	PHP_FALIAS(errno,mysqli_stmt_errno,NULL)
+	PHP_FALIAS(error,mysqli_stmt_error,NULL)
+	{NULL, NULL, NULL}
+};
+/* }}} */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/ext/standard/tests/strings/htmlentities15.phpt b/ext/standard/tests/strings/htmlentities15.phpt
new file mode 100644
index 0000000000..a0e534aba0
--- /dev/null
+++ b/ext/standard/tests/strings/htmlentities15.phpt
@@ -0,0 +1,22 @@
+--TEST--
+htmlentities() test 15 (setlocale / KOI8-R)
+--INI--
+output_handler=
+default_charset=
+mbstring.internal_encoding=none
+--SKIPIF--
+<?php
+$result = (bool)setlocale(LC_CTYPE, "ru_RU.koi8r");
+if (!$result || preg_match('/koi8/i', setlocale(LC_CTYPE, 0)) == 0) {
+	die("skip setlocale() failed\n");
+}
+?>
+--FILE--
+<?php
+setlocale(LC_CTYPE, "ru_RU.koi8r");
+$str = "роскошный";
+var_dump($str, htmlentities($str, ENT_QUOTES, ''));
+?>
+--EXPECT--
+string(9) "роскошный"
+string(63) "&#1088;&#1086;&#1089;&#1082;&#1086;&#1096;&#1085;&#1099;&#1081;"
diff --git a/ext/standard/tests/strings/htmlentities16.phpt b/ext/standard/tests/strings/htmlentities16.phpt
new file mode 100644
index 0000000000..e2d8c12153
--- /dev/null
+++ b/ext/standard/tests/strings/htmlentities16.phpt
@@ -0,0 +1,23 @@
+--TEST--
+htmlentities() test 16 (mbstring / cp1251)
+--INI--
+output_handler=
+--SKIPIF--
+<?php
+	extension_loaded("mbstring") or die("skip mbstring not available\n");
+	mb_internal_encoding('cp1251');
+	$php_errormsg = NULL;
+	@htmlentities("\x88\xa9\xd2\xcf\xd3\xcb\xcf\xdb\xce\xd9\xca", ENT_QUOTES, '');
+	if ($php_errormsg) {
+		die("skip cp1251 chracter set is not supported on this platform.\n");
+	}
+?>
+--FILE--
+<?php
+mb_internal_encoding('cp1251');
+$str = "\x88\xa9\xf0\xee\xf1\xea\xee\xf8\xed\xfb\xe9";
+var_dump($str, htmlentities($str, ENT_QUOTES, ''));
+?>
+--EXPECT--
+string(11) "┬╘роскошный"
+string(63) "&euro;&copy;&#1088;&#1086;&#1089;&#1082;&#1086;&#1096;&#1085;&#1099;&#1081;"