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

2 files changed, 457 insertions, 0 deletions

diff --git a/ext/gd/libgd/xbm.c b/ext/gd/libgd/xbm.c
new file mode 100644
index 0000000000..c730c3666d
--- /dev/null
+++ b/ext/gd/libgd/xbm.c
@@ -0,0 +1,153 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 4                                                        |
+   +----------------------------------------------------------------------+
+   | 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: Marcus Boerger <helly@php.net>                               |
+   +----------------------------------------------------------------------+
+ */
+
+/* $Id$ */
+
+#include <stdio.h>
+#include <math.h>
+#include <string.h>
+#include <stdlib.h>
+#include "gd.h"
+#include "gdhelpers.h"
+
+#include "php.h"
+
+#define MAX_XBM_LINE_SIZE 255
+
+gdImagePtr
+gdImageCreateFromXbm (FILE * fd)
+{
+	char fline[MAX_XBM_LINE_SIZE];
+	char iname[MAX_XBM_LINE_SIZE];
+	char *type;
+	int value;
+	unsigned int width = 0, height = 0;
+	int fail = 0;
+	int max_bit = 0;
+
+	gdImagePtr im;
+	int bytes = 0, i;
+	int bit, x = 0, y = 0;
+	int ch;
+	char h[8];
+	unsigned int b;
+	
+	rewind(fd);
+	while (fgets(fline, MAX_XBM_LINE_SIZE, fd)) {
+		fline[MAX_XBM_LINE_SIZE-1] = '\0';
+		if (strlen(fline) == MAX_XBM_LINE_SIZE-1) {
+			return 0;
+		}
+		if (sscanf(fline, "#define %s %d", iname, &value) == 2) {
+			if (!(type = strrchr(iname, '_'))) {
+				type = iname;
+			} else {
+				type++;
+			}
+	
+			if (!strcmp("width", type)) {
+				width = (unsigned int) value;
+			}
+			if (!strcmp("height", type)) {
+				height = (unsigned int) value;
+			}
+		} else {
+			if ( sscanf(fline, "static unsigned char %s = {", iname) == 1
+			  || sscanf(fline, "static char %s = {", iname) == 1)
+			{
+				max_bit = 128;
+			} else if (sscanf(fline, "static unsigned short %s = {", iname) == 1
+					|| sscanf(fline, "static short %s = {", iname) == 1)
+			{
+				max_bit = 32768;
+			}
+			if (max_bit) {
+				bytes = (width * height / 8) + 1;
+				if (!bytes) {
+					return 0;
+				}
+				if (!(type = strrchr(iname, '_'))) {
+					type = iname;
+				} else {
+					type++;
+				}
+				if (!strcmp("bits[]", type)) {
+					break;
+				}
+			}
+ 		}
+	}
+	if (!bytes || !max_bit) {
+		return 0;
+	}
+
+	im = gdImageCreate(width, height);
+	gdImageColorAllocate(im, 255, 255, 255);
+	gdImageColorAllocate(im, 0, 0, 0);
+	h[2] = '\0';
+	h[4] = '\0';
+	for (i = 0; i < bytes; i++) {
+		while (1) {
+			if ((ch=getc(fd)) == EOF) {
+				fail = 1;
+				break;
+			}
+			if (ch == 'x') {
+				break;
+			}
+		}
+		if (fail) {
+			break;
+		}
+		/* Get hex value */
+		if ((ch=getc(fd)) == EOF) {
+			break;
+		}
+		h[0] = ch;
+		if ((ch=getc(fd)) == EOF) {
+			break;
+		}
+		h[1] = ch;
+		if (max_bit == 32768) {
+			if ((ch=getc(fd)) == EOF) {
+				break;
+			}
+			h[2] = ch;
+			if ((ch=getc(fd)) == EOF) {
+				break;
+			}
+			h[3] = ch;
+		}
+		sscanf(h, "%x", &b);
+		for (bit = 1; bit <= max_bit; bit = bit << 1) {
+			gdImageSetPixel(im, x++, y, (b & bit) ? 1 : 0);
+			if (x == im->sx) {
+				x = 0;
+				y++;
+				if (y == im->sy) {
+					return im;
+				}
+				break;
+			}
+		}
+	}
+
+	php_gd_error("EOF before image was complete\n");
+	gdImageDestroy(im);
+	return 0;
+}
diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h
new file mode 100644
index 0000000000..c823e64527
--- /dev/null
+++ b/ext/mysqli/php_mysqli.h
@@ -0,0 +1,304 @@
+/*
+  +----------------------------------------------------------------------+
+  | 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$ 
+*/
+
+/* A little hack to prevent build break, when mysql is used together with
+ * c-client, which also defines LIST.
+ */
+#ifdef LIST
+#undef LIST
+#endif
+
+#include <mysql.h>
+#include "mysqli_profiler.h"
+
+#ifndef PHP_MYSQLI_H
+#define PHP_MYSQLI_H
+
+
+typedef struct {
+	ulong		buflen;
+	char		*buffer;
+	ulong		type;
+} BIND_BUFFER;
+
+typedef struct {
+	MYSQL_STMT	*stmt;
+	unsigned int	var_cnt;
+	zval		**vars;
+ 	BIND_BUFFER	*bind;
+	char		*is_null;
+	char		type;
+} STMT;
+
+typedef struct {
+	void		*prinfo;	/* profiler info */
+	void		*ptr;		/* resource: (mysql, result, stmt) */
+} MYSQLI_RESOURCE;
+
+typedef struct _mysqli_object {
+	zend_object zo;
+	void *ptr;
+} mysqli_object; /* extends zend_object */
+
+#define MYSQLI_PR_MAIN		0
+#define MYSQLI_PR_MYSQL		1
+#define MYSQLI_PR_QUERY		2
+#define MYSQLI_PR_QUERY_RESULT	3
+#define MYSQLI_PR_STMT		4
+#define MYSQLI_PR_STMT_RESULT	5
+#define MYSQLI_PR_RESULT	6
+#define MYSQLI_PR_COMMAND	7
+
+
+#define phpext_mysqli_ptr &mysqli_module_entry
+
+#ifdef PHP_WIN32
+#define PHP_MYSQLI_API __declspec(dllexport)
+#else
+#define PHP_MYSQLI_API
+#endif
+
+#ifdef ZTS
+#include "TSRM.h"
+#endif
+
+#define PHP_MYSQLI_EXPORT(__type) PHP_MYSQLI_API __type
+
+extern zend_module_entry mysqli_module_entry;
+extern function_entry mysqli_functions[];
+extern function_entry mysqli_link_methods[];
+extern function_entry mysqli_stmt_methods[];
+extern function_entry mysqli_result_methods[];
+extern void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int flag);
+extern void php_clear_stmt_bind(STMT *stmt);
+
+zend_class_entry *mysqli_link_class_entry;
+zend_class_entry *mysqli_stmt_class_entry;
+zend_class_entry *mysqli_result_class_entry;
+
+zend_class_entry _mysqli_link_class_entry;
+zend_class_entry _mysqli_stmt_class_entry;
+zend_class_entry _mysqli_result_class_entry;
+
+PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry * TSRMLS_DC);
+
+#define REGISTER_MYSQLI_CLASS_ENTRY(name, mysqli_entry, class_functions) { \
+	INIT_CLASS_ENTRY(_##mysqli_entry,name,class_functions); \
+	_##mysqli_entry.create_object = mysqli_objects_new; \
+	mysqli_entry = zend_register_internal_class(&_##mysqli_entry TSRMLS_CC); \
+} \
+
+#define MYSQLI_REGISTER_RESOURCE_EX(__ptr, __zval, __ce)  \
+	((mysqli_object *) zend_object_store_get_object(__zval TSRMLS_CC))->ptr = __ptr;
+
+#define MYSQLI_RETURN_RESOURCE(__ptr, __ce) \
+	Z_TYPE_P(return_value) = IS_OBJECT; \
+	(return_value)->value.obj = mysqli_objects_new(__ce TSRMLS_CC); \
+	MYSQLI_REGISTER_RESOURCE_EX(__ptr, return_value, __ce)
+
+#define MYSQLI_REGISTER_RESOURCE(__ptr, __ce) \
+{\
+	zval *object = getThis();\
+	if (!object) {\
+		object = return_value;\
+		Z_TYPE_P(object) = IS_OBJECT;\
+		(object)->value.obj = mysqli_objects_new(__ce TSRMLS_CC);\
+	}\
+	MYSQLI_REGISTER_RESOURCE_EX(__ptr, object, __ce)\
+}
+
+#define MYSQLI_FETCH_RESOURCE(__ptr, __type, __prptr, __prtype, __id, __name) \
+{ \
+	MYSQLI_RESOURCE *my_res; \
+	mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(*(__id) TSRMLS_CC);\
+	if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) {\
+  		php_error(E_WARNING, "Couldn't fetch %s", intern->zo.ce->name);\
+  		RETURN_NULL();\
+  	}\
+	__ptr = (__type)my_res->ptr; \
+	__prptr = (__prtype)my_res->prinfo; \
+	if (!strcmp((char *)__name, "mysqli_stmt")) {\
+		if (!((STMT *)__ptr)->stmt->mysql) {\
+  			php_error(E_WARNING, "Statement isn't valid anymore");\
+			RETURN_NULL();\
+		}\
+	}\
+} 
+
+#define MYSQLI_CLEAR_RESOURCE(__id) \
+{ \
+	mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(*(__id) TSRMLS_CC);\
+	efree(intern->ptr); \
+	intern->ptr = NULL; \
+}
+
+#define MYSQLI_RETURN_LONG_LONG(__val) \
+{ \
+	if ((__val) < LONG_MAX) {		\
+		RETURN_LONG((__val));		\
+	} else {				\
+		char ret[40];			\
+		sprintf(ret, "%llu", (__val));	\
+		RETURN_STRING(ret,1);		\
+	}					\
+}
+
+#define MYSQLI_STORE_RESULT 	0
+#define MYSQLI_USE_RESULT 	1
+
+/* for mysqli_fetch_assoc */
+#define MYSQLI_ASSOC		1
+#define MYSQLI_NUM		2
+#define MYSQLI_BOTH		3
+
+/* for mysqli_bind_param */
+#define MYSQLI_BIND_INT		1
+#define MYSQLI_BIND_DOUBLE	2
+#define MYSQLI_BIND_STRING	3
+#define MYSQLI_BIND_SEND_DATA	4
+
+/* fetch types */
+#define FETCH_SIMPLE		1
+#define FETCH_RESULT		2
+
+PHP_MYSQLI_API void mysqli_register_link(zval *return_value, void *link TSRMLS_DC);
+PHP_MYSQLI_API void mysqli_register_stmt(zval *return_value, void *stmt TSRMLS_DC);
+PHP_MYSQLI_API void mysqli_register_result(zval *return_value, void *result TSRMLS_DC);
+PHP_MYSQLI_API void php_mysqli_set_error(long mysql_errno, char *mysql_err TSRMLS_DC);
+
+PHP_MINIT_FUNCTION(mysqli);
+PHP_MSHUTDOWN_FUNCTION(mysqli);
+PHP_RINIT_FUNCTION(mysqli);
+PHP_RSHUTDOWN_FUNCTION(mysqli);
+PHP_MINFO_FUNCTION(mysqli);
+
+PHP_FUNCTION(mysqli_affected_rows);
+PHP_FUNCTION(mysqli_autocommit);
+PHP_FUNCTION(mysqli_bind_param);
+PHP_FUNCTION(mysqli_bind_result);
+PHP_FUNCTION(mysqli_change_user);
+PHP_FUNCTION(mysqli_character_set_name);
+PHP_FUNCTION(mysqli_close);
+PHP_FUNCTION(mysqli_commit);
+PHP_FUNCTION(mysqli_connect);
+PHP_FUNCTION(mysqli_data_seek);
+PHP_FUNCTION(mysqli_debug);
+PHP_FUNCTION(mysqli_disable_reads_from_master);
+PHP_FUNCTION(mysqli_disable_rpl_parse);
+PHP_FUNCTION(mysqli_dump_debug_info);
+PHP_FUNCTION(mysqli_enable_reads_from_master);
+PHP_FUNCTION(mysqli_enable_rpl_parse);
+PHP_FUNCTION(mysqli_errno);
+PHP_FUNCTION(mysqli_error);
+PHP_FUNCTION(mysqli_execute);
+PHP_FUNCTION(mysqli_fetch);
+PHP_FUNCTION(mysqli_fetch_array);
+PHP_FUNCTION(mysqli_fetch_assoc);
+PHP_FUNCTION(mysqli_fetch_object);
+PHP_FUNCTION(mysqli_fetch_field);
+PHP_FUNCTION(mysqli_fetch_fields);
+PHP_FUNCTION(mysqli_fetch_field_direct);
+PHP_FUNCTION(mysqli_fetch_lengths);
+PHP_FUNCTION(mysqli_fetch_row);
+PHP_FUNCTION(mysqli_field_count);
+PHP_FUNCTION(mysqli_field_seek);
+PHP_FUNCTION(mysqli_field_tell);
+PHP_FUNCTION(mysqli_free_result);
+PHP_FUNCTION(mysqli_get_client_info);
+PHP_FUNCTION(mysqli_get_host_info);
+PHP_FUNCTION(mysqli_get_proto_info);
+PHP_FUNCTION(mysqli_get_server_info);
+PHP_FUNCTION(mysqli_get_server_version);
+PHP_FUNCTION(mysqli_info);
+PHP_FUNCTION(mysqli_insert_id);
+PHP_FUNCTION(mysqli_init);
+PHP_FUNCTION(mysqli_kill);
+PHP_FUNCTION(mysqli_master_query);
+PHP_FUNCTION(mysqli_num_fields);
+PHP_FUNCTION(mysqli_num_rows);
+PHP_FUNCTION(mysqli_options);
+PHP_FUNCTION(mysqli_param_count);
+PHP_FUNCTION(mysqli_ping);
+PHP_FUNCTION(mysqli_prepare);
+PHP_FUNCTION(mysqli_query);
+PHP_FUNCTION(mysqli_prepare_result);
+PHP_FUNCTION(mysqli_profiler);
+PHP_FUNCTION(mysqli_read_query_result);
+PHP_FUNCTION(mysqli_real_connect);
+PHP_FUNCTION(mysqli_real_query);
+PHP_FUNCTION(mysqli_real_escape_string);
+PHP_FUNCTION(mysqli_reload);
+PHP_FUNCTION(mysqli_rollback);
+PHP_FUNCTION(mysqli_row_seek);
+PHP_FUNCTION(mysqli_rpl_parse_enabled);
+PHP_FUNCTION(mysqli_rpl_probe);
+PHP_FUNCTION(mysqli_rpl_query_type);
+PHP_FUNCTION(mysqli_select_db);
+PHP_FUNCTION(mysqli_send_long_data);
+PHP_FUNCTION(mysqli_send_query);
+PHP_FUNCTION(mysqli_slave_query);
+PHP_FUNCTION(mysqli_ssl_set);
+PHP_FUNCTION(mysqli_stat);
+PHP_FUNCTION(mysqli_stmt_affected_rows);
+PHP_FUNCTION(mysqli_stmt_close);
+PHP_FUNCTION(mysqli_stmt_errno);
+PHP_FUNCTION(mysqli_stmt_error);
+PHP_FUNCTION(mysqli_stmt_store_result);
+PHP_FUNCTION(mysqli_store_result);
+PHP_FUNCTION(mysqli_thread_id);
+PHP_FUNCTION(mysqli_thread_safe);
+PHP_FUNCTION(mysqli_use_result);
+PHP_FUNCTION(mysqli_warning_count);
+
+ZEND_BEGIN_MODULE_GLOBALS(mysqli)
+	long		default_link;
+	long		num_links;
+	long		max_links;
+	unsigned int	default_port;
+	char		*default_host;
+	char		*default_user;
+	char		*default_pw;
+	char		*default_socket;
+	long		error_no;
+	char		*error_msg;
+	unsigned int	profiler;
+ZEND_END_MODULE_GLOBALS(mysqli)
+
+#ifdef ZTS
+#define MyG(v) TSRMG(mysqli_globals_id, zend_mysqli_globals *, v)
+#else
+#define MyG(v) (mysqli_globals.v)
+#endif
+
+#define my_estrdup(x) (x) ? estrdup(x) : NULL
+#define my_efree(x) if (x) efree(x)
+
+ZEND_EXTERN_MODULE_GLOBALS(mysqli);
+
+#endif	/* PHP_MYSQLI.H */
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */