moved fdf, hyperwave, informix and some smaller files

39 files changed, 6890 insertions, 147 deletions

diff --git a/Makefile.in b/Makefile.in
index fe84a47bbb..d3f2c042da 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,18 +69,16 @@ OBJS = main.o internal_functions.o snprintf.o php3_sprintf.o \
        php_ini.o
 
 FUNCTIONS_SOURCE = functions/fhttpd.c \
-       functions/crypt.c functions/dl.c \
-       functions/head.c functions/imap.c functions/mime.c \
+       functions/imap.c functions/mime.c \
        functions/pgsql.c functions/post.c functions/sybase.c \
        functions/sybase-ct.c functions/xml.c \
-       functions/ldap.c functions/zlib.c functions/ifx.c \
-       functions/pdf.c \
-       functions/fdf.c functions/snmp.c functions/interbase.c \
+       functions/ldap.c functions/zlib.c \
+       functions/pdf.c functions/snmp.c functions/interbase.c \
        functions/sysvsem.c functions/sysvshm.c
 
 FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o)
 PHPLIBS = -L@top_srcdir@/libzend -lzend -L@top_srcdir@/ext -lphpext
-LIBS = $(PHPLIBS) $(EXTRA_LIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @REGEX_LIB@ @DBM_LIB@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @IMAP_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@
+LIBS = $(PHPLIBS) $(EXTRA_LIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @REGEX_LIB@ @DBM_LIB@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @IMAP_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@
 
 all: $(BINNAME)
 
@@ -111,9 +109,6 @@ libphp3.so: $(srcdir)/mod_php3.c libmodphp3-so.a
 regex/libregex.a:
 	(cd regex; $(MAKE) lib)
 
-functions/ifx.c: functions/ifx.ec
-	(if test @INFORMIXDIR@; then esql -e @IFX_ESQL_FLAGS@ functions/ifx.ec; mv ifx.c functions; else touch functions/ifx.c; fi)
-
 configuration-parser.h configuration-parser.c:	$(srcdir)/configuration-parser.y
 	bison -p cfg -v -d $(srcdir)/configuration-parser.y -o configuration-parser.c
 
diff --git a/acconfig.h.in b/acconfig.h.in
index 53b5a83720..645c3c3266 100644
--- a/acconfig.h.in
+++ b/acconfig.h.in
@@ -182,6 +182,3 @@
 
 /* Define if you have the pdflib library */
 #define HAVE_PDFLIB 0
-
-/* Define if you have the fdftk library */
-#define HAVE_FDFLIB 0
diff --git a/configure.in.in b/configure.in.in
index 055b170b9d..a8aaed39eb 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1008,78 +1008,6 @@ dnl## AC_SUBST(SNMP_INCLUDE)
 INCLUDES="$INCLUDES $SNMP_INCLUDE"
 
 
-AC_MSG_CHECKING(for Informix support)
-AC_ARG_WITH(informix,
-[  --with-informix[=DIR]   Include Informix support.  DIR is the Informix base
-                          install directory, defaults to ${INFORMIXDIR:-nothing}.],
-[
-	if test "$withval" != "no"; then
-		if test "$INFORMIXDIR" = ""; then
-			INFORMIX_WARNING="
-WARNING: You asked for Informix support, but don't have \\\$INFORMIXDIR
-	 environment value set up. Configuring and compiling Informix
-	 support to PHP3 is impossible and has been turned off. Please
-	 try again after setting up your environment."
-			AC_MSG_RESULT(no)
-		else
-			if test "$withval" = "yes"; then
-				IFX_INCDIR=$INFORMIXDIR/incl/esql
-				IFX_LIBDIR="-L$INFORMIXDIR/lib -L$INFORMIXDIR/lib/esql"
-			else
-				IFX_INCDIR=$withval/incl/esql
-				IFX_LIBDIR="-L$withval/lib -L$withval/lib/esql"
-				if test "$withval" != "$INFORMIXDIR"; then
-					INFORMIX_WARNING="
-WARNING: You specified Informix base install directory that is different
-	 than your \\\$INFORMIXDIR environment variable. You'd better know
-	 exactly what you are doing."
-				fi
-    		fi
-			IFX_INCLUDE=-I$IFX_INCDIR
-			IFX_LFLAGS=$IFX_LIBDIR
-			if test -z "$IFX_LIBS"; then
-				IFX_LIBS=`esql -libs | sed -e 's/-lm$//'`
-				dnl  -lm twice otherwise?
-				IFX_LIBS=`echo $IFX_LIBS | sed -e 's/Libraries to be used://g' -e 's/esql: error -55923: No source or object file\.//g'`
-				dnl Seems to get rid of newlines.
-				dnl According to Perls DBD-Informix, might contain these strings.
-			else
-				dnl Allow override to use static and/or threaded libs
-				IFX_LIBS="$IFX_LIBS"
-			fi
-			CFLAGS="$CFLAGS $IFX_INCLUDE"
-			LDFLAGS="$LDFLAGS $IFX_LFLAGS"
-
-		    if test "`uname -s 2>/dev/null`" = "AIX"; then
-				CFLAGS="$CFLAGS -D__H_LOCALEDEF"
-			fi
-			AC_DEFINE(HAVE_IFX)
-			AC_MSG_CHECKING([Informix version])
-			IFX_VERSION=[`esql -V | sed -ne '1 s/^[^0-9]*\([0-9]\)\.\([0-9]*\).*/\1\2/p'`]
-			if test $IFX_VERSION -ge "900"; then
-				AC_DEFINE(HAVE_IFX_IUS)
-				IFX_ESQL_FLAGS="-EDHAVE_IFX_IUS"
-			else
-				IFX_ESQL_FLAGS="-EUHAVE_IFX_IUS"
-			fi
-			AC_SUBST(IFX_ESQL_FLAGS)
-			AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION)
-			AC_MSG_RESULT(yes)
-		fi
-	else
-		INFORMIXDIR=
-		AC_MSG_RESULT(no)
-	fi
-],[
-  AC_MSG_RESULT(no)
-])
-AC_SUBST(IFX_LIBS)
-AC_SUBST(IFX_LFLAGS)
-AC_SUBST(INFORMIXDIR)
-dnl## AC_SUBST(IFX_INCLUDE)
-INCLUDES="$INCLUDES $IFX_INCLUDE"
-
-
 AC_MSG_CHECKING(for InterBase support)
 AC_ARG_WITH(interbase,
 [  --with-interbase[=DIR]  Include InterBase support.  DIR is the InterBase base
@@ -1197,40 +1125,6 @@ dnl## AC_SUBST(PDFLIB_INCLUDE)
 INCLUDES="$INCLUDES $PDFLIB_INCLUDE"
 
 
-AC_MSG_CHECKING(whether to include fdftk support)
-AC_ARG_WITH(fdftk,
-[  --with-fdftk[=DIR]      Include fdftk support.
-                          DIR is the fdftk lib install directory,
-                          defaults to /usr/local.],
-[
-  case "$withval" in
-    no)
-      AC_MSG_RESULT(no) ;;
-    yes)
-      AC_MSG_RESULT(yes)
-      AC_CHECK_LIB(FdfTk, FDFOpen, [AC_DEFINE(HAVE_FDFLIB) FDFLIB_LIBS="-lFdfTk"],
-        [AC_MSG_ERROR(fdftk module requires fdftk 2.0)]) ;;
-    *)
-      test -f $withval/include/Fdftk.h && FDFLIB_INCLUDE="-I$withval/include"
-      if test -n "$FDFLIB_INCLUDE" ; then
-        AC_MSG_RESULT(yes)
-        old_LIBS=$LIBS
-        LIBS="$LIBS -L$withval/lib"
-        AC_CHECK_LIB(FdfTk, FDFOpen, [AC_DEFINE(HAVE_FDFLIB) FDFLIB_LIBS="-L$withval/lib -lFdfTk"],
-          [AC_MSG_ERROR(fdftk module requires ftftk lib 2.0.)])
-        LIBS=$old_LIBS
-      else
-        AC_MSG_RESULT(no)
-      fi ;;
-  esac
-],[
-  AC_MSG_RESULT(no)
-])
-AC_SUBST(FDFLIB_LIBS)
-dnl## AC_SUBST(FDFLIB_INCLUDE)
-INCLUDES="$INCLUDES $FDFLIB_INCLUDE"
-
-
 AC_MSG_CHECKING(whether to enable System V semaphore support)
 AC_ARG_ENABLE(sysvsem,
 [  --enable-sysvsem        Enable System V semaphore support.],
@@ -1335,10 +1229,7 @@ if test "$BINNAME" = "php"; then
 		fi
 	fi
 fi
-dnl Warn if Informix support was requested but environment is not set up correctly.
-if test "$INFORMIX_WARNING" != ""; then
-		echo "$INFORMIX_WARNING"
-fi
+
 ])
 
 divert
diff --git a/ext/apache/apache.c b/ext/apache/apache.c
index 614268d4be..1c7f9de43e 100644
--- a/ext/apache/apache.c
+++ b/ext/apache/apache.c
@@ -34,7 +34,7 @@
 #include "tls.h"
 #endif
 #include "php.h"
-#include "functions/head.h"
+#include "ext/standard/head.h"
 #include "php_globals.h"
 #include "php_ini.h"
 #include "mod_php3.h"
diff --git a/ext/fdf/Makefile.am b/ext/fdf/Makefile.am
new file mode 100644
index 0000000000..91e9efef83
--- /dev/null
+++ b/ext/fdf/Makefile.am
@@ -0,0 +1,6 @@
+# $Id$
+
+INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
+noinst_LIBRARIES=libphpext_fdf.a
+libphpext_fdf_a_SOURCES=fdf.c
+
diff --git a/ext/fdf/config.h.stub b/ext/fdf/config.h.stub
new file mode 100644
index 0000000000..de2cdd917d
--- /dev/null
+++ b/ext/fdf/config.h.stub
@@ -0,0 +1,2 @@
+/* Define if you have the fdftk library */
+#define HAVE_FDFLIB 0
diff --git a/ext/fdf/config.m4 b/ext/fdf/config.m4
new file mode 100644
index 0000000000..ba1d6f7dd2
--- /dev/null
+++ b/ext/fdf/config.m4
@@ -0,0 +1,39 @@
+dnl $Id$
+
+AC_MSG_CHECKING(whether to include fdftk support)
+AC_ARG_WITH(fdftk,
+[  --with-fdftk[=DIR]      Include fdftk support.
+                          DIR is the fdftk lib install directory,
+                          defaults to /usr/local.],
+[
+  case "$withval" in
+    no)
+      AC_MSG_RESULT(no) ;;
+    yes)
+      AC_MSG_RESULT(yes)
+      PHP_EXTENSION(fdf)
+      AC_CHECK_LIB(FdfTk, FDFOpen, [
+        AC_DEFINE(HAVE_FDFLIB)
+        EXTRA_LIBS="$EXTRA_LIBS -lFdfTk"
+      ],[AC_MSG_ERROR(fdftk module requires fdftk 2.0)])
+      ;;
+    *)
+      test -f $withval/include/Fdftk.h && FDFLIB_INCLUDE="-I$withval/include"
+      if test -n "$FDFLIB_INCLUDE" ; then
+        AC_MSG_RESULT(yes)
+        PHP_EXTENSION(fdf)
+        old_LIBS=$LIBS
+        LIBS="$LIBS -L$withval/lib"
+        AC_CHECK_LIB(FdfTk, FDFOpen, [
+          AC_DEFINE(HAVE_FDFLIB)
+          EXTRA_LIBS="$EXTRA_LIBS -L$withval/lib -lFdfTk"
+        ],[AC_MSG_ERROR(fdftk module requires ftftk lib 2.0.)])
+        LIBS=$old_LIBS
+        INCLUDES="$INCLUDES $FDFLIB_INCLUDE"
+      else
+        AC_MSG_RESULT(no)
+      fi ;;
+  esac
+],[
+  AC_MSG_RESULT(no)
+])
diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c
new file mode 100644
index 0000000000..e16b6bcb82
--- /dev/null
+++ b/ext/fdf/fdf.c
@@ -0,0 +1,531 @@
+/*
+   +----------------------------------------------------------------------+
+   | 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: Uwe Steinmann <Uwe.Steinmann@fernuni-hagen.de>              |
+   +----------------------------------------------------------------------+
+ */
+
+/* $Id$ */
+
+/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
+   http://beta1.adobe.com/ada/acrosdk/forms.html. */
+
+/* Note that there is no code from the FdfTk lib in this file */
+
+#if !PHP_31 && defined(THREAD_SAFE)
+#undef THREAD_SAFE
+#endif
+
+#include "php.h"
+#include "head.h"
+#include <math.h>
+#include "php3_fdf.h"
+
+#if HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#if WIN32|WINNT
+# include <io.h>
+# include <fcntl.h>
+#endif
+
+#if HAVE_FDFLIB
+
+#ifdef THREAD_SAFE
+DWORD FDFlibTls;
+static int numthreads=0;
+
+typedef struct fdflib_global_struct{
+	int le_fdf;
+} fdflib_global_struct;
+
+# define FDF_GLOBAL(a) fdflib_globals->a
+# define FDF_TLS_VARS fdflib_global_struct *fdflib_globals=TlsGetValue(FDFlibTls)
+
+#else
+#  define FDF_GLOBAL(a) a
+#  define FDF_TLS_VARS
+int le_fdf_info;
+int le_fdf;
+#endif
+
+function_entry fdf_functions[] = {
+	{"fdf_open",				php3_fdf_open,				NULL},
+	{"fdf_create",				php3_fdf_create,			NULL},
+	{"fdf_close",				php3_fdf_close,				NULL},
+	{"fdf_save",				php3_fdf_save,				NULL},
+	{"fdf_get_value",			php3_fdf_get_value,			NULL},
+	{"fdf_set_value",			php3_fdf_set_value,			NULL},
+	{"fdf_next_field_name",			php3_fdf_next_field_name,			NULL},
+	{"fdf_set_ap",				php3_fdf_set_ap,			NULL},
+	{"fdf_set_status",			php3_fdf_set_status,		NULL},
+	{"fdf_get_status",			php3_fdf_get_status,		NULL},
+	{"fdf_set_file",			php3_fdf_set_file,		NULL},
+	{"fdf_get_file",			php3_fdf_get_file,		NULL},
+	{NULL, NULL, NULL}
+};
+
+php3_module_entry fdf_module_entry = {
+	"fdf", fdf_functions, php3_minit_fdf, php3_mend_fdf, NULL, NULL, php3_info_fdf, STANDARD_MODULE_PROPERTIES
+};
+
+#if COMPILE_DL
+#include "dl/phpdl.h"
+DLEXPORT php3_module_entry *get_module(void) { return &fdf_module_entry; }
+#endif
+
+int php3_minit_fdf(INIT_FUNC_ARGS)
+{
+	FDFErc err;
+	FDF_GLOBAL(le_fdf) = register_list_destructors(FDFClose, NULL);
+	err = FDFInitialize();
+	if(err == FDFErcOK)
+		printf("FDFINitital executed\n");
+	return SUCCESS;
+}
+
+void php3_info_fdf(void) {
+	/* need to use a PHPAPI function here because it is external module in windows */
+	php3_printf("FdfTk Version %s", FDFGetVersion());
+}
+
+int php3_mend_fdf(void){
+	FDFErc err;
+	err = FDFFinalize();
+	if(err == FDFErcOK)
+		printf("FDFFinalize executed\n");
+	return SUCCESS;
+}
+
+/* {{{ proto int fdf_open(string filename)
+   Opens a new fdf document */
+void php3_fdf_open(INTERNAL_FUNCTION_PARAMETERS) {
+	pval *file;
+	int id, type;
+	FDFDoc fdf;
+	FDFErc err;
+	FDF_TLS_VARS;
+
+
+	if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &file) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	convert_to_string(file);
+
+	err = FDFOpen(file->value.str.val, 0, &fdf);
+	if(err != FDFErcOK)
+		printf("Aiii, error\n");
+	if(!fdf)
+		RETURN_FALSE;
+
+	id = php3_list_insert(fdf,FDF_GLOBAL(le_fdf));
+	RETURN_LONG(id);
+} /* }}} */
+
+/* {{{ proto void fdf_close(int fdfdoc)
+   Closes the fdf document */
+void php3_fdf_close(INTERNAL_FUNCTION_PARAMETERS) {
+	pval *arg1;
+	int id, type;
+	FDFDoc fdf;
+	FDF_TLS_VARS;
+
+	if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	convert_to_long(arg1);
+	id=arg1->value.lval;
+	fdf = php3_list_find(id,&type);
+	if(!fdf || type!=FDF_GLOBAL(le_fdf)) {
+		php3_error(E_WARNING,"Unable to find file identifier %d",id);
+		RETURN_FALSE;
+	}
+
+//	FDFClose(fdf);
+	php3_list_delete(id);
+
+	RETURN_TRUE;
+} /* }}} */
+
+/* {{{ proto void fdf_create(void)
+   Creates a new fdf document */
+void php3_fdf_create(INTERNAL_FUNCTION_PARAMETERS) {
+	int id, type;
+	FDFDoc fdf;
+	FDFErc err;
+	FDF_TLS_VARS;
+
+	err = FDFCreate(&fdf);
+	if(err != FDFErcOK)
+		printf("Aiii, error\n");
+	if(!fdf)
+		RETURN_FALSE;
+
+	id = php3_list_insert(fdf,FDF_GLOBAL(le_fdf));
+	RETURN_LONG(id);
+}
+/* }}} */
+
+/* {{{ proto void fdf_get_value(int fdfdoc, string fieldname)
+   Gets the value of a field as string */
+void php3_fdf_get_value(INTERNAL_FUNCTION_PARAMETERS) {
+	pval *arg1, *arg2;
+	int id, type;
+	ASInt32 nr;
+	char *buffer;
+	FDFDoc fdf;
+	FDFErc err;
+	FDF_TLS_VARS;
+
+	if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	convert_to_long(arg1);
+	convert_to_string(arg2);
+	id=arg1->value.lval;
+	fdf = php3_list_find(id,&type);
+	if(!fdf || type!=FDF_GLOBAL(le_fdf)) {
+		php3_error(E_WARNING,"Unable to find file identifier %d",id);
+		RETURN_FALSE;
+	}
+
+	err = FDFGetValue(fdf, arg2->value.str.val, NULL, 0, &nr);
+	if(err != FDFErcOK)
+		printf("Aiii, error\n");
+	buffer = emalloc(nr);
+	err = FDFGetValue(fdf, arg2->value.str.val, buffer, nr, &nr);
+	if(err != FDFErcOK)
+		printf("Aiii, error\n");
+
+	RETURN_STRING(buffer, 0);
+}
+/* }}} */
+
+/* {{{ proto void fdf_set_value(int fdfdoc, string fieldname, string value, int isName)
+   Sets the value of a field */
+void php3_fdf_set_value(INTERNAL_FUNCTION_PARAMETERS) {
+	pval *arg1, *arg2, *arg3, *arg4;
+	int id, type;
+	FDFDoc fdf;
+	FDFErc err;
+	FDF_TLS_VARS;
+
+	if (ARG_COUNT(ht) != 4 || getParameters(ht, 4, &arg1, &arg2, &arg3, &arg4) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	convert_to_long(arg1);
+	convert_to_string(arg2);
+	convert_to_string(arg3);
+	convert_to_long(arg4);
+	id=arg1->value.lval;
+	fdf = php3_list_find(id,&type);
+	if(!fdf || type!=FDF_GLOBAL(le_fdf)) {
+		php3_error(E_WARNING,"Unable to find file identifier %d",id);
+		RETURN_FALSE;
+	}
+
+	err = FDFSetValue(fdf, arg2->value.str.val, arg3->value.str.val, (ASBool) arg4->value.lval);
+	if(err != FDFErcOK)
+		printf("Aiii, error\n");
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto void fdf_next_field_name(int fdfdoc [, string fieldname])
+   Gets the name of the next field name or the first field name */
+void php3_fdf_next_field_name(INTERNAL_FUNCTION_PARAMETERS) {
+	pval *argv[2];
+	int id, type, argc;
+	ASInt32 nr;
+	char *buffer, *fieldname;
+	FDFDoc fdf;
+	FDFErc err;
+	FDF_TLS_VARS;
+
+	argc = ARG_COUNT(ht);
+	if((argc > 2) || (argc < 1))
+		WRONG_PARAM_COUNT;
+
+	if (getParametersArray(ht, argc, argv) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	convert_to_long(argv[0]);
+	if(argc == 2) {
+		convert_to_string(argv[1]);
+		fieldname = argv[1]->value.str.val;
+	} else {
+		fieldname = NULL;
+	}
+	id=argv[0]->value.lval;
+	fdf = php3_list_find(id,&type);
+	if(!fdf || type!=FDF_GLOBAL(le_fdf)) {
+		php3_error(E_WARNING,"Unable to find file identifier %d",id);
+		RETURN_FALSE;
+	}
+
+	err = FDFNextFieldName(fdf, fieldname, NULL, 0, &nr);
+	if(err != FDFErcOK)
+		printf("Aiii, error\n");
+	if(nr == 0)
+		RETURN_STRING(empty_string, 1);
+		
+	buffer = emalloc(nr);
+	err = FDFNextFieldName(fdf, fieldname, buffer, nr, &nr);
+	if(err != FDFErcOK)
+		printf("Aiii, error\n");
+
+	RETURN_STRING(buffer, 0);
+}
+/* }}} */
+
+/* {{{ proto void fdf_set_ap(int fdfdoc, string fieldname, int face, string filename, int pagenr)
+   Sets the value of a field */
+void php3_fdf_set_ap(INTERNAL_FUNCTION_PARAMETERS) {
+	pval *arg1, *arg2, *arg3, *arg4, *arg5;
+	int id, type;
+	FDFDoc fdf;
+	FDFErc err;
+	FDFAppFace face;
+	FDF_TLS_VARS;
+
+	if (ARG_COUNT(ht) != 5 || getParameters(ht, 5, &arg1, &arg2, &arg3, &arg4, &arg5) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	convert_to_long(arg1);
+	convert_to_string(arg2);
+	convert_to_long(arg3);
+	convert_to_string(arg4);
+	convert_to_long(arg5);
+	id=arg1->value.lval;
+	fdf = php3_list_find(id,&type);
+	if(!fdf || type!=FDF_GLOBAL(le_fdf)) {
+		php3_error(E_WARNING,"Unable to find file identifier %d",id);
+		RETURN_FALSE;
+	}
+
+	switch(arg3->value.lval) {
+		case 1:
+			face = FDFNormalAP;
+			break;
+		case 2:
+			face = FDFRolloverAP;
+			break;
+		case 3:
+			face = FDFDownAP;
+			break;
+		default:
+			face = FDFNormalAP;
+	}
+
+	err = FDFSetAP(fdf, arg2->value.str.val, face, NULL, arg4->value.str.val, (ASInt32) arg5->value.lval);
+	if(err != FDFErcOK)
+		printf("Aiii, error\n");
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto void fdf_set_status(int fdfdoc, string status)
+   Sets the value in the /Status key. */
+void php3_fdf_set_status(INTERNAL_FUNCTION_PARAMETERS) {
+	pval *arg1, *arg2;
+	int id, type;
+	ASInt32 nr;
+	FDFDoc fdf;
+	FDFErc err;
+	FDF_TLS_VARS;
+
+	if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	convert_to_long(arg1);
+	convert_to_string(arg2);
+	id=arg1->value.lval;
+	fdf = php3_list_find(id,&type);
+	if(!fdf || type!=FDF_GLOBAL(le_fdf)) {
+		php3_error(E_WARNING,"Unable to find file identifier %d",id);
+		RETURN_FALSE;
+	}
+
+	err = FDFSetStatus(fdf, arg2->value.str.val);
+	if(err != FDFErcOK)
+		printf("Aiii, error\n");
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto void fdf_get_status(int fdfdoc)
+   Gets the value in the /Status key. */
+void php3_fdf_get_status(INTERNAL_FUNCTION_PARAMETERS) {
+	pval *arg1;
+	int id, type;
+	ASInt32 nr;
+	char *buf;
+	FDFDoc fdf;
+	FDFErc err;
+	FDF_TLS_VARS;
+
+	if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	convert_to_long(arg1);
+	id=arg1->value.lval;
+	fdf = php3_list_find(id,&type);
+	if(!fdf || type!=FDF_GLOBAL(le_fdf)) {
+		php3_error(E_WARNING,"Unable to find file identifier %d",id);
+		RETURN_FALSE;
+	}
+
+	err = FDFGetStatus(fdf, NULL, 0,  &nr);
+	if(err != FDFErcOK)
+		printf("Aiii, error\n");
+	if(nr == 0)
+		RETURN_STRING(empty_string, 1);
+	buf = emalloc(nr);
+	err = FDFGetStatus(fdf, buf, nr,  &nr);
+	if(err != FDFErcOK)
+		printf("Aiii, error\n");
+
+	RETURN_STRING(buf, 0);
+}
+/* }}} */
+
+/* {{{ proto void fdf_set_file(int fdfdoc, string filename)
+   Sets the value of the FDF's /F key */
+void php3_fdf_set_file(INTERNAL_FUNCTION_PARAMETERS) {
+	pval *arg1, *arg2;
+	int id, type;
+	FDFDoc fdf;
+	FDFErc err;
+	FDF_TLS_VARS;
+
+	if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	convert_to_long(arg1);
+	convert_to_string(arg2);
+	id=arg1->value.lval;
+	fdf = php3_list_find(id,&type);
+	if(!fdf || type!=FDF_GLOBAL(le_fdf)) {
+		php3_error(E_WARNING,"Unable to find file identifier %d",id);
+		RETURN_FALSE;
+	}
+
+	err = FDFSetFile(fdf, arg2->value.str.val);
+	if(err != FDFErcOK)
+		printf("Aiii, error\n");
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto void fdf_get_file(int fdfdoc)
+   Gets the value in the /F key. */
+void php3_fdf_get_file(INTERNAL_FUNCTION_PARAMETERS) {
+	pval *arg1;
+	int id, type;
+	ASInt32 nr;
+	char *buf;
+	FDFDoc fdf;
+	FDFErc err;
+	FDF_TLS_VARS;
+
+	if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &arg1) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	convert_to_long(arg1);
+	id=arg1->value.lval;
+	fdf = php3_list_find(id,&type);
+	if(!fdf || type!=FDF_GLOBAL(le_fdf)) {
+		php3_error(E_WARNING,"Unable to find file identifier %d",id);
+		RETURN_FALSE;
+	}
+
+	err = FDFGetFile(fdf, NULL, 0,  &nr);
+	if(err != FDFErcOK)
+		printf("Aiii, error\n");
+	if(nr == 0)
+		RETURN_STRING(empty_string, 1);
+	buf = emalloc(nr);
+	err = FDFGetFile(fdf, buf, nr,  &nr);
+	if(err != FDFErcOK)
+		printf("Aiii, error\n");
+
+	RETURN_STRING(buf, 0);
+}
+/* }}} */
+
+/* {{{ proto void fdf_save(int fdfdoc, string filename)
+   Writes out an FDF file. */
+void php3_fdf_save(INTERNAL_FUNCTION_PARAMETERS) {
+	pval *arg1, *arg2;
+	int id, type;
+	FDFDoc fdf;
+	FDFErc err;
+	FDF_TLS_VARS;
+
+	if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	convert_to_long(arg1);
+	convert_to_string(arg2);
+	id=arg1->value.lval;
+	fdf = php3_list_find(id,&type);
+	if(!fdf || type!=FDF_GLOBAL(le_fdf)) {
+		php3_error(E_WARNING,"Unable to find file identifier %d",id);
+		RETURN_FALSE;
+	}
+
+	err = FDFSave(fdf, arg2->value.str.val);
+	if(err != FDFErcOK)
+		printf("Aiii, error\n");
+
+	RETURN_TRUE;
+} /* }}} */
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
diff --git a/ext/fdf/php3_fdf.h b/ext/fdf/php3_fdf.h
new file mode 100644
index 0000000000..08f7bee509
--- /dev/null
+++ b/ext/fdf/php3_fdf.h
@@ -0,0 +1,63 @@
+/*
+   +----------------------------------------------------------------------+
+   | 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: Uwe Steinmann                                               |
+   +----------------------------------------------------------------------+
+ */
+/* $Id$ */
+
+#ifndef _PHP3_FDF_H
+#define _PHP3_FDF_H
+
+#if HAVE_FDFLIB
+#if WIN32|WINNT
+#else
+#define UNIX_DEV
+#endif
+
+#include <FdfTk.h>
+
+extern php3_module_entry fdf_module_entry;
+#define fdf_module_ptr &fdf_module_entry
+
+extern int php3_minit_fdf(INIT_FUNC_ARGS);
+extern int php3_mend_fdf(void);
+extern void php3_info_fdf(void);
+extern void php3_fdf_open(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_fdf_close(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_fdf_create(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_fdf_save(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_fdf_get_value(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_fdf_set_value(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_fdf_next_field_name(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_fdf_set_ap(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_fdf_get_status(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_fdf_set_status(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_fdf_set_file(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_fdf_get_file(INTERNAL_FUNCTION_PARAMETERS);
+#else
+#define fdf_module_ptr NULL
+#endif
+#endif /* _PHP3_FDF_H */
diff --git a/ext/fdf/setup.stub b/ext/fdf/setup.stub
new file mode 100644
index 0000000000..9637713bde
--- /dev/null
+++ b/ext/fdf/setup.stub
@@ -0,0 +1,7 @@
+# $Source$
+# $Id$
+
+define_option with-fdftk 'Acrobat Forms (Ftf Toolkit 2.0) support? ' yesnodir \
+    'no /usr/local ftktk install' \
+'    Whether to use the Ftf Toolkit support to write/read .fdf-files.\n
+    Tested for version 2.0!'
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index b241b01e8f..884908db12 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -39,7 +39,7 @@
 # include "tls.h"
 #endif
 #include "php.h"
-#include "functions/head.h"
+#include "ext/standard/head.h"
 #include <math.h>
 #include "php3_gd.h"
 
diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c
index db1da999db..ddb64c4762 100644
--- a/ext/hyperwave/hw.c
+++ b/ext/hyperwave/hw.c
@@ -34,7 +34,7 @@
 #include "config.h"
 #endif
 #include "php.h"
-#include "functions/head.h"
+#include "ext/standard/head.h"
 
 #if HYPERWAVE
 
diff --git a/ext/informix/Makefile.am b/ext/informix/Makefile.am
new file mode 100644
index 0000000000..7122ce04f5
--- /dev/null
+++ b/ext/informix/Makefile.am
@@ -0,0 +1,12 @@
+# $Id$
+
+INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
+noinst_LIBRARIES=libphpext_informix.a
+libphpext_informix_a_SOURCES=ifx.c
+
+ifx.c: ifx.ec
+	(if test -d @INFORMIXDIR@; then \
+	   esql -e @IFX_ESQL_FLAGS@ ifx.ec; \
+	 else \
+	   touch ifx.c; \
+	 fi)
diff --git a/ext/informix/config.h.stub b/ext/informix/config.h.stub
new file mode 100644
index 0000000000..4b90981e71
--- /dev/null
+++ b/ext/informix/config.h.stub
@@ -0,0 +1,2 @@
+/* define if you want to use the informix extension */
+/* #undef HAVE_LIBINFORMIX */
diff --git a/ext/informix/config.m4 b/ext/informix/config.m4
new file mode 100644
index 0000000000..4ef3b5878e
--- /dev/null
+++ b/ext/informix/config.m4
@@ -0,0 +1,80 @@
+dnl $Id$
+
+divert(3)
+
+AC_MSG_CHECKING(for Informix support)
+AC_ARG_WITH(informix,
+[  --with-informix[=DIR]   Include Informix support.  DIR is the Informix base
+                          install directory, defaults to ${INFORMIXDIR:-nothing}.],
+[
+  if test "$withval" != "no"; then
+    if test "$INFORMIXDIR" = ""; then
+      INFORMIX_WARNING="
+WARNING: You asked for Informix support, but don't have \\\$INFORMIXDIR
+   environment value set up. Configuring and compiling Informix
+   support to PHP3 is impossible and has been turned off. Please
+   try again after setting up your environment."
+      AC_MSG_RESULT(no)
+    else
+      if test "$withval" = "yes"; then
+        IFX_INCDIR=$INFORMIXDIR/incl/esql
+        IFX_LIBDIR="-L$INFORMIXDIR/lib -L$INFORMIXDIR/lib/esql"
+      else
+        IFX_INCDIR=$withval/incl/esql
+        IFX_LIBDIR="-L$withval/lib -L$withval/lib/esql"
+        if test "$withval" != "$INFORMIXDIR"; then
+          INFORMIX_WARNING="
+WARNING: You specified Informix base install directory that is different
+   than your \\\$INFORMIXDIR environment variable. You'd better know
+   exactly what you are doing."
+        fi
+        fi
+      IFX_INCLUDE=-I$IFX_INCDIR
+      IFX_LFLAGS=$IFX_LIBDIR
+      if test -z "$IFX_LIBS"; then
+        IFX_LIBS=`esql -libs | sed -e 's/-lm$//'`
+        dnl  -lm twice otherwise?
+        IFX_LIBS=`echo $IFX_LIBS | sed -e 's/Libraries to be used://g' -e 's/esql: error -55923: No source or object file\.//g'`
+        dnl Seems to get rid of newlines.
+        dnl According to Perls DBD-Informix, might contain these strings.
+      else
+        dnl Allow override to use static and/or threaded libs
+        IFX_LIBS="$IFX_LIBS"
+      fi
+      CFLAGS="$CFLAGS $IFX_INCLUDE"
+      LDFLAGS="$LDFLAGS $IFX_LFLAGS"
+
+        if test "`uname -s 2>/dev/null`" = "AIX"; then
+        CFLAGS="$CFLAGS -D__H_LOCALEDEF"
+      fi
+      AC_DEFINE(HAVE_IFX)
+      AC_MSG_CHECKING([Informix version])
+      IFX_VERSION=[`esql -V | sed -ne '1 s/^[^0-9]*\([0-9]\)\.\([0-9]*\).*/\1\2/p'`]
+      if test $IFX_VERSION -ge "900"; then
+        AC_DEFINE(HAVE_IFX_IUS)
+        IFX_ESQL_FLAGS="-EDHAVE_IFX_IUS"
+      else
+        IFX_ESQL_FLAGS="-EUHAVE_IFX_IUS"
+      fi
+      AC_SUBST(IFX_ESQL_FLAGS)
+      AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION)
+      AC_MSG_RESULT(yes)
+      PHP_EXTENSION(informix)
+      EXTRA_LIBS="$EXTRA_LIBS $IFX_LIBS $IFX_LFLAGS"
+      INCLUDES="$INCLUDES $IFX_INCLUDE"
+    fi
+  else
+    INFORMIXDIR=
+    AC_MSG_RESULT(no)
+  fi
+],[
+  AC_MSG_RESULT(no)
+])
+AC_SUBST(INFORMIXDIR)
+
+divert(5)
+
+dnl Warn if Informix support was requested but environment is not set up correctly.
+if test "$INFORMIX_WARNING" != ""; then
+  echo "$INFORMIX_WARNING"
+fi
diff --git a/ext/informix/ifx.ec b/ext/informix/ifx.ec
new file mode 100644
index 0000000000..519045d369
--- /dev/null
+++ b/ext/informix/ifx.ec
@@ -0,0 +1,4814 @@
+/*
+   +----------------------------------------------------------------------+
+   | 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: Danny Heijl  <Danny.Heijl@cevi.be> : initial cut (ODS 7.2x) |
+   |          Christian Cartus <chc@idgruppe.de> : blobs, and IUS 9       |
+   |          Jouni Ahto <jah@guru.cultnet.fi>   : configuration stuff    |
+   | Based on the MySQL code by:  Zeev Suraski <bourbon@netvision.net.il> |
+   +----------------------------------------------------------------------+
+ */
+/* -------------------------------------------------------------------
+ * if you want a function reference : "grep '^\*\*' ifx.ec" will give
+ * you a very short one
+ * -------------------------------------------------------------------
+*/
+/*
+ * I started with the mysql-driver, removed all stuff I did not need,
+ * and changed all mysql-specific stuff to Informix-ESQL/C.
+ * I used the X-open way of using ESQL/C (using an SQL descriptor and
+ * not the Informix-specific way). It is perhaps a little bit slower,
+ * but more verbose and less prone to coding errors.
+ * This is the first time in my life I coded ESQL/C, so do not look too
+ * closely and do not hesitate to point out errors/omissions etc...
+ * Aug. 8, 1998 
+ * Danny Heijl, Danny.Heijl@cevi.be
+ */
+
+/* TODO:
+ *
+ * ? Safe mode implementation
+ *
+ * ? cursory stored procedures
+ * Jouni Ahto promised help and already did the configuration stuff
+ * (Jouni Ahto <jah@guru.cultnet.fi>).
+ *
+ */
+
+
+/*
+Changes: 23.8.1998 (chc@idgruppe.de)
+- full blobsupport (TEXT and BYTE)
+- new functions: ifx_create_blob, ifx_copy_blob, ifx_free_blob, 
+                 ifx_update_blob, ifx_get_blob, ifx_blobinfile_mode
+- file and memory-support of blobs
+- load TEXT and BYTE in memory by default 
+  (controllable by "ifx.blobinfile" in php3.ini-file)
+- update all functions to support blobs (ifx_query, ifx_prepare, 
+  ifx_do, ifx_htmltbl_result, ifx_fetch_row)
+- minor bug-fixes
+- Test-Page (informix_blob.php3) which tests the blob-support
+
+
+Changes: 11.9.1998 (chc@idgruppe.de)
+- ifx_query and ifx_prepare: blob-paramters now as array
+- new funtions: ifx_textasvarchar, ifx_byteasvarchar, ifx_nullformat
+- new php.ini-variables: ifx.textasvarchar, ifx.byteasvarchar, ifx.nullformat
+- update all functions to support blobarray and new functions 
+  (ifx_query, ifx_prepare, ifx_do, ifx_htmltbl_result, ifx_fetch_row)
+- minor bug-fixes
+- Test-Page (informix_blob.php3) updated
+- begin with coding of slob-support(still deactivated, not yet complete: #undef HAVE_IFX_IUS in php3_ifx.h)
+- ifx_fetch_row returns always a blob-id (contains "NULL"-flag or content from db)(except ifx_textasvarchar, ifx_byteasvarchar set to 1)
+
+Changes 14.9.1998 (chc@idgruppe.de)
+- supports now IUS- serial8,int8,boolean, nchar, nvchar, lvarchar
+- still incomplete slob-support
+
+Changes 25.9.1998 (danny.heijl@cevi.be)
+- cursory and non-cursory stored procedures
+
+Changes 24.10.1998 (chc@idgruppe.de)
+- changes the internal structure of IFX_BLOB and IFX_SLOB into one structure. it is now prepared for general-id-usage
+- fixed a lvarchar-bug (i hate esql/c)
+
+Changes 12.11.1998 (danny.heijl@cevi.be)
+- added proto comments
+*/
+
+
+#if defined(COMPILE_DL)
+#include "dl/phpdl.h"
+#endif
+#if defined(THREAD_SAFE)
+#include "tls.h"
+DWORD InformixTls;
+static int numthreads=0;
+void *ifx_mutex;
+#endif
+
+#if WIN32|WINNT
+#include <winsock.h>
+#else
+#include "config.h"
+#include "build-defs.h"
+
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include <netdb.h>
+#include <netinet/in.h>
+#endif
+
+#include "php.h"
+#include "internal_functions.h"
+#include "php3_string.h"
+#include "build-defs.h"
+#include "php3_ifx.h"
+
+#if HAVE_IFX
+
+#ifndef CLIENT_SQLI_VER					/* 7.10 on (at least) AIX is missing this */
+#define CLIENT_SQLI_VER IFX_VERSION
+#endif
+
+#define TYPE_BLBYTE 0
+#define TYPE_BLTEXT 1
+#define TYPE_SLOB 2
+#define TYPE_CHAR 3
+
+
+#define BLMODE_INMEM    0
+#define BLMODE_INFILE   1
+
+
+#define IFX_SCROLL  1
+#define IFX_HOLD    2
+
+EXEC SQL include locator;
+EXEC SQL include sqltypes;
+EXEC SQL include sqlstype;
+
+#include <errno.h>
+
+typedef char IFX[128];
+
+#include "php3_list.h"
+
+#define SAFE_STRING(s) ((s)?(s):"")
+
+function_entry ifx_functions[] = {
+    {"ifx_connect",        php3_ifx_connect,            NULL},
+    {"ifx_pconnect",       php3_ifx_pconnect,           NULL},
+    {"ifx_close",          php3_ifx_close,              NULL},
+    {"ifx_query",          php3_ifx_query,              NULL},
+    {"ifx_prepare",        php3_ifx_prepare,            NULL},
+    {"ifx_do",             php3_ifx_do,                 NULL},
+    {"ifx_error",          php3_ifx_error,              NULL},
+    {"ifx_errormsg",       php3_ifx_errormsg,           NULL},
+    {"ifx_affected_rows",  php3_ifx_affected_rows,      NULL},
+    {"ifx_num_rows",       php3_ifx_num_rows,           NULL},
+    {"ifx_num_fields",     php3_ifx_num_fields,         NULL},
+    {"ifx_fetch_row",      php3_ifx_fetch_row,          NULL},
+    {"ifx_free_result",    php3_ifx_free_result,        NULL},
+    {"ifx_htmltbl_result", php3_ifx_htmltbl_result,     NULL},
+    {"ifx_fieldtypes",     php3_ifx_fieldtypes,         NULL},
+    {"ifx_fieldproperties",php3_ifx_fieldproperties,    NULL},
+
+    {"ifx_create_blob",    php3_ifx_create_blob,        NULL},
+    {"ifx_free_blob",      php3_ifx_free_blob,          NULL},
+    {"ifx_get_blob",       php3_ifx_get_blob,           NULL},
+    {"ifx_update_blob",    php3_ifx_update_blob,        NULL},
+    {"ifx_copy_blob"      ,php3_ifx_copy_blob,          NULL},
+    {"ifx_textasvarchar"  ,php3_ifx_textasvarchar,      NULL},
+    {"ifx_byteasvarchar"  ,php3_ifx_byteasvarchar,      NULL},
+    {"ifx_nullformat"     ,php3_ifx_nullformat,         NULL},
+    {"ifx_blobinfile_mode",php3_ifx_blobinfile_mode,    NULL},
+
+    {"ifx_create_char",    php3_ifx_create_char,        NULL},
+    {"ifx_free_char",      php3_ifx_free_char,          NULL},
+    {"ifx_get_char",       php3_ifx_get_char,           NULL},
+    {"ifx_update_char",    php3_ifx_update_char,        NULL},
+
+$ifdef HAVE_IFX_IUS;
+    {"ifxus_create_slob",  php3_ifxus_create_slob,      NULL},
+    {"ifxus_close_slob",   php3_ifxus_close_slob,       NULL},
+    {"ifxus_open_slob",    php3_ifxus_open_slob,        NULL},
+    {"ifxus_free_slob",    php3_ifxus_free_slob,        NULL},
+    {"ifxus_read_slob",    php3_ifxus_read_slob,        NULL},
+    {"ifxus_write_slob",   php3_ifxus_write_slob,       NULL},
+    {"ifxus_seek_slob",    php3_ifxus_seek_slob,        NULL},
+    {"ifxus_tell_slob",    php3_ifxus_tell_slob,        NULL},
+$endif;
+    
+    {NULL,                 NULL,                        NULL}
+};
+
+php3_module_entry ifx_module_entry = {
+    "Informix", 
+    ifx_functions, 
+    php3_minit_ifx, 
+    php3_mshutdown_ifx, 
+    php3_rinit_ifx, 
+    NULL, 
+    php3_info_ifx, 
+    STANDARD_MODULE_PROPERTIES
+};
+
+#if COMPILE_DL
+DLEXPORT php3_module_entry *get_module(void) { return &ifx_module_entry; }
+#if 0
+BOOL WINAPI DllMain(HANDLE hModule, 
+                      DWORD  ul_reason_for_call, 
+                      LPVOID lpReserved)
+{
+    return 1;
+}
+#endif
+#endif
+
+
+#if defined(THREAD_SAFE)
+typedef struct ifx_global_struct{
+    ifx_module php3_ifx_module;
+}ifx_global_struct;
+
+#define Informix_GLOBAL(a) ifx_globals->a
+
+#define Informix_TLS_VARS \
+    ifx_global_struct *ifx_globals; \
+    ifx_globals=TlsGetValue(InformixTls); 
+
+#else
+#define Informix_GLOBAL(a) a
+#define Informix_TLS_VARS
+ifx_module php3_ifx_module;
+#endif
+
+#define CHECK_LINK(link) {     \
+    if (link==0) {             \
+        php3_error(E_WARNING,  \
+                "Informix:  A link to the server could not be established"); \
+        RETURN_FALSE;          \
+        }                      \
+    }
+
+#define DUP    1
+
+EXEC SQL DEFINE IFX_SUCCESS 0;
+EXEC SQL DEFINE IFX_WARNING 1;
+EXEC SQL DEFINE IFX_ERROR  -1;
+EXEC SQL DEFINE IFX_NODATA 100;
+
+static int ifx_check()
+{
+    int _ifx_check;
+
+    _ifx_check = IFX_ERROR;
+    
+    if (SQLSTATE[0] == '0') {
+        switch (SQLSTATE[1]) {
+            case '0':
+                _ifx_check = IFX_SUCCESS;
+                break;
+            case '1':
+                _ifx_check = IFX_WARNING;
+                break;
+            case '2':
+                _ifx_check = IFX_NODATA;
+                break;
+            default :
+                _ifx_check = IFX_ERROR;
+                break;
+        }  
+    }
+
+    return _ifx_check;
+}
+
+static char *ifx_error(ifx)
+    EXEC SQL BEGIN DECLARE SECTION;
+        PARAMETER char *ifx;
+    EXEC SQL END DECLARE SECTION;
+{
+   char *ifx_err_msg;
+   char   c;
+   int errorcode;
+
+   if (Informix_GLOBAL(php3_ifx_module).sv_sqlcode == 0)
+       errorcode = SQLCODE;
+   else
+       errorcode = Informix_GLOBAL(php3_ifx_module).sv_sqlcode;
+
+   switch (ifx_check()) {
+       case IFX_SUCCESS:
+         c = ' ';
+         break;       
+       case IFX_WARNING:
+         c = 'W';
+         break;       
+       case IFX_ERROR:
+         c = 'E';
+         break;       
+       case IFX_NODATA:
+         c = 'N';
+         break;       
+       default:
+         c = '?';
+         break;       
+   }    
+   ifx_err_msg = emalloc(64);
+   sprintf(ifx_err_msg,"%c [SQLSTATE=%c%c %c%c%c  SQLCODE=%d]",
+                        c,
+                        SQLSTATE[0],
+                        SQLSTATE[1],
+                        SQLSTATE[2],
+                        SQLSTATE[3],
+                        SQLSTATE[4],
+                        errorcode);
+   return(ifx_err_msg);
+}
+
+
+
+static void _close_ifx_link(link)
+    EXEC SQL BEGIN DECLARE SECTION;
+        PARAMETER char *link;
+    EXEC SQL END DECLARE SECTION;
+{
+
+    Informix_TLS_VARS;
+
+    EXEC SQL SET CONNECTION :link;
+    EXEC SQL DISCONNECT CURRENT;
+    efree(link);
+    Informix_GLOBAL(php3_ifx_module).num_links--;
+}
+
+static void _close_ifx_plink(link)
+EXEC SQL BEGIN DECLARE SECTION;
+  PARAMETER char *link;
+EXEC SQL END DECLARE SECTION;
+{
+
+    Informix_TLS_VARS;
+
+    EXEC SQL SET CONNECTION :link;
+    EXEC SQL DISCONNECT CURRENT;
+
+    free(link);
+    Informix_GLOBAL(php3_ifx_module).num_persistent--;
+    Informix_GLOBAL(php3_ifx_module).num_links--;
+}
+
+static void ifx_free_result(a_result_id)
+char *a_result_id;
+{
+  return;
+}
+
+int php3_minit_ifx(INIT_FUNC_ARGS)
+{
+#if defined(THREAD_SAFE)
+    ifx_global_struct *ifx_globals;
+    CREATE_MUTEX(ifx_mutex,"Informix_TLS");
+    SET_MUTEX(ifx_mutex);
+    numthreads++;
+    if (numthreads==1){
+        if ((InformixTls=TlsAlloc())==0xFFFFFFFF){
+            FREE_MUTEX(ifx_mutex);
+            return 0;
+        }
+    }
+    FREE_MUTEX(ifx_mutex);
+    ifx_globals = (ifx_global_struct *) 
+                           LocalAlloc(LPTR, sizeof(ifx_global_struct)); 
+    TlsSetValue(InformixTls, (void *) ifx_globals);
+#endif
+
+    if (cfg_get_long("ifx.blobinfile",
+                      &Informix_GLOBAL(php3_ifx_module).blobinfile)==FAILURE) {
+        Informix_GLOBAL(php3_ifx_module).blobinfile=BLOBINFILE;
+    }
+
+    if (cfg_get_long("ifx.textasvarchar",
+                      &Informix_GLOBAL(php3_ifx_module).textasvarchar)==FAILURE) {
+        Informix_GLOBAL(php3_ifx_module).textasvarchar=0;
+    }
+
+
+    if (cfg_get_long("ifx.byteasvarchar",
+                      &Informix_GLOBAL(php3_ifx_module).byteasvarchar)==FAILURE) {
+        Informix_GLOBAL(php3_ifx_module).byteasvarchar=0;
+    }
+
+    if (cfg_get_long("ifx.charasvarchar",
+                      &Informix_GLOBAL(php3_ifx_module).charasvarchar)==FAILURE) {
+        Informix_GLOBAL(php3_ifx_module).charasvarchar=0;
+    }
+
+    if (cfg_get_long("ifx.nullformat",
+                      &Informix_GLOBAL(php3_ifx_module).nullformat)==FAILURE) {
+        Informix_GLOBAL(php3_ifx_module).nullformat=0;
+    }
+
+    if (cfg_get_long("ifx.allow_persistent",
+                      &Informix_GLOBAL(php3_ifx_module).allow_persistent)==FAILURE) {
+        Informix_GLOBAL(php3_ifx_module).allow_persistent=1;
+    }
+    if (cfg_get_long("ifx.max_persistent",
+                      &Informix_GLOBAL(php3_ifx_module).max_persistent)==FAILURE) {
+        Informix_GLOBAL(php3_ifx_module).max_persistent=-1;
+    }
+    if (cfg_get_long("ifx.max_links",
+                     &Informix_GLOBAL(php3_ifx_module).max_links)==FAILURE) {
+        Informix_GLOBAL(php3_ifx_module).max_links=-1;
+    }
+    if (cfg_get_string("ifx.default_host",
+                      &Informix_GLOBAL(php3_ifx_module).default_host)==FAILURE
+              || Informix_GLOBAL(php3_ifx_module).default_host[0]==0) {
+        Informix_GLOBAL(php3_ifx_module).default_host=NULL;
+    }
+    if (cfg_get_string("ifx.default_user",
+                       &Informix_GLOBAL(php3_ifx_module).default_user)==FAILURE
+              || Informix_GLOBAL(php3_ifx_module).default_user[0]==0) {
+        Informix_GLOBAL(php3_ifx_module).default_user=NULL;
+    }
+    if (cfg_get_string("ifx.default_password",
+                        &Informix_GLOBAL(php3_ifx_module).default_password)==FAILURE
+              || Informix_GLOBAL(php3_ifx_module).default_password[0]==0) {    
+        Informix_GLOBAL(php3_ifx_module).default_password=NULL;
+    }
+    Informix_GLOBAL(php3_ifx_module).num_persistent=0;
+    Informix_GLOBAL(php3_ifx_module).sv_sqlcode=0;
+    Informix_GLOBAL(php3_ifx_module).le_result = 
+            register_list_destructors(ifx_free_result,NULL);
+    Informix_GLOBAL(php3_ifx_module).le_idresult = 
+            register_list_destructors(ifx_free_result,NULL);
+    Informix_GLOBAL(php3_ifx_module).le_link =  
+            register_list_destructors(_close_ifx_link,NULL);
+    Informix_GLOBAL(php3_ifx_module).le_plink = 
+            register_list_destructors(NULL,_close_ifx_plink);
+
+#if 0
+    printf("Registered:  %d,%d,%d\n",
+         Informix_GLOBAL(php3_ifx_module).le_result,
+         Informix_GLOBAL(php3_ifx_module).le_link,
+         Informix_GLOBAL(php3_ifx_module).le_plink);
+#endif
+    ifx_module_entry.type = type;
+
+    REGISTER_LONG_CONSTANT("IFX_SCROLL", IFX_SCROLL, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("IFX_HOLD", IFX_HOLD, CONST_CS | CONST_PERSISTENT);
+$ifdef HAVE_IFX_IUS;
+    REGISTER_LONG_CONSTANT("IFX_LO_RDONLY", LO_RDONLY, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("IFX_LO_WRONLY", LO_WRONLY, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("IFX_LO_APPEND", LO_APPEND, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("IFX_LO_RDWR", LO_RDWR, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("IFX_LO_BUFFER", LO_BUFFER, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("IFX_LO_NOBUFFER", LO_NOBUFFER, CONST_CS | CONST_PERSISTENT);
+$endif;
+
+    return SUCCESS;
+}
+
+
+int php3_mshutdown_ifx(void){
+#if defined(THREAD_SAFE)
+    Informix_TLS_VARS;
+    if (ifx_globals != 0) 
+        LocalFree((HLOCAL) ifx_globals); 
+    SET_MUTEX(ifx_mutex);
+    numthreads--;
+    if (!numthreads){
+        if (!TlsFree(InformixTls)){
+            FREE_MUTEX(ifx_mutex);
+            return 0;
+        }
+    }
+    FREE_MUTEX(ifx_mutex);
+#endif
+    return SUCCESS;
+}
+
+int php3_rinit_ifx(INIT_FUNC_ARGS)
+{
+    Informix_TLS_VARS;
+
+    Informix_GLOBAL(php3_ifx_module).default_link=-1;
+    Informix_GLOBAL(php3_ifx_module).num_links = 
+                 Informix_GLOBAL(php3_ifx_module).num_persistent;
+    return SUCCESS;
+}
+
+void php3_info_ifx(void)
+{
+    char maxp[16],maxl[16];
+    Informix_TLS_VARS;
+
+    
+    if (Informix_GLOBAL(php3_ifx_module).max_persistent==-1) {
+        strcpy(maxp,"Unlimited");
+    } else {
+        snprintf(maxp,15,"%ld",Informix_GLOBAL(php3_ifx_module).max_persistent);
+        maxp[15]=0;
+    }
+    if (Informix_GLOBAL(php3_ifx_module).max_links==-1) {
+        strcpy(maxl,"Unlimited");
+    } else {
+        snprintf(maxl,15,"%ld",Informix_GLOBAL(php3_ifx_module).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>%02.2f</td></tr>\n"
+#if !(WIN32|WINNT)
+                "<tr><td valign=\"top\">Compilation definitions:</td><td>"
+                "<tt>IFX_INCLUDE=%s<br>\n"
+                "IFX_LFLAGS=%s<br>\n"
+                "IFX_LIBS=%s<br></tt></td></tr>"
+#endif
+                "</table>\n",
+                (Informix_GLOBAL(php3_ifx_module).allow_persistent?"Yes":"No"),
+                Informix_GLOBAL(php3_ifx_module).num_persistent,maxp,
+                Informix_GLOBAL(php3_ifx_module).num_links,maxl,
+                (double)(CLIENT_SQLI_VER/100.0)
+#if !(WIN32|WINNT)
+                ,PHP_IFX_INCLUDE,
+                PHP_IFX_LFLAGS,
+                PHP_IFX_LIBS
+#endif
+                );
+}
+
+/* ----------------------------------------------------------------------
+** int ifx_(p)connect(string $database,string $userid,string $password)
+**
+** connects to $database (db@server syntax) using $userid and $password
+**
+** returns a connection id on success or FALSE one error  
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifx_(p)connect(string database,string userid,string password)
+   connects to database using userid/password, returns connection id */
+static void php3_ifx_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
+{
+
+    EXEC SQL BEGIN DECLARE SECTION;
+      char *user,*passwd,*host;
+      char *ifx;
+    EXEC SQL END DECLARE SECTION;    
+
+    char *tmp;
+    char *hashed_details;
+    int hashed_details_length;
+    Informix_TLS_VARS;
+
+    if (php3_ini.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)+3+3;
+        hashed_details = (char *) emalloc(hashed_details_length+1);
+        sprintf(hashed_details,"ifx__%s_",user);
+    } else {
+        host = Informix_GLOBAL(php3_ifx_module).default_host;
+        user = Informix_GLOBAL(php3_ifx_module).default_user;
+        passwd = Informix_GLOBAL(php3_ifx_module).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("ifx___")-1 + 
+                          strlen(SAFE_STRING(host))+
+                          strlen(SAFE_STRING(user))+
+                          strlen(SAFE_STRING(passwd));
+        hashed_details = (char *) emalloc(hashed_details_length+1);
+        sprintf(hashed_details,"ifx_%s_%s_%s",
+                               SAFE_STRING(host), 
+                               SAFE_STRING(user), 
+                               SAFE_STRING(passwd));
+    }
+
+
+    Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+
+    if (!Informix_GLOBAL(php3_ifx_module).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 (Informix_GLOBAL(php3_ifx_module).max_links!=-1 &&
+                    Informix_GLOBAL(php3_ifx_module).num_links >=
+                    Informix_GLOBAL(php3_ifx_module).max_links) {
+                php3_error(E_WARNING,
+                           "Informix:  Too many open links (%d)",
+                           Informix_GLOBAL(php3_ifx_module).num_links);
+                efree(hashed_details);
+                RETURN_FALSE;
+            }
+            if (Informix_GLOBAL(php3_ifx_module).max_persistent!=-1 && 
+                    Informix_GLOBAL(php3_ifx_module).num_persistent >=
+                    Informix_GLOBAL(php3_ifx_module).max_persistent) {
+                php3_error(E_WARNING,
+                           "Informix:  Too many open persistent links (%d)",
+                           Informix_GLOBAL(php3_ifx_module).num_persistent);
+                efree(hashed_details);
+                RETURN_FALSE;
+            }
+            /* create the link */
+            ifx = (char *)malloc(sizeof(IFX));
+            Informix_GLOBAL(php3_ifx_module).connectionid++;
+            sprintf(ifx,"%s%x", 
+                    user, 
+                    Informix_GLOBAL(php3_ifx_module).connectionid);
+
+            EXEC SQL CONNECT TO :host AS :ifx 
+                     USER :user USING :passwd 
+                     WITH CONCURRENT TRANSACTION;  
+
+            if (ifx_check() == IFX_ERROR) {
+                Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+                php3_error(E_WARNING,ifx_error(ifx));
+                free(ifx);
+                efree(hashed_details);
+                RETURN_FALSE;
+            }
+            
+            /* hash it up */
+            new_le.type = Informix_GLOBAL(php3_ifx_module).le_plink;
+            new_le.ptr = ifx;
+            if (_php3_hash_update(plist, hashed_details, 
+                   hashed_details_length+1, 
+                   (void *) &new_le, sizeof(list_entry), NULL)==FAILURE) {
+                free(ifx);
+                efree(hashed_details);
+                RETURN_FALSE;
+            }
+            Informix_GLOBAL(php3_ifx_module).num_persistent++;
+            Informix_GLOBAL(php3_ifx_module).num_links++;
+        } else {  /* we do */
+            if (le->type != Informix_GLOBAL(php3_ifx_module).le_plink) {
+                RETURN_FALSE;
+            }
+            /* ensure that the link did not die */
+            ifx = le->ptr;
+            EXEC SQL SET CONNECTION :ifx;
+            if (ifx_check() == IFX_ERROR) {
+                          /* the link died      */
+                ifx = le->ptr;        /* reconnect silently */
+                EXEC SQL CONNECT TO :host AS :ifx 
+                         USER :user USING :passwd 
+                         WITH CONCURRENT TRANSACTION;  
+
+                if (ifx_check() == IFX_ERROR) {
+                    Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+                    php3_error(E_WARNING,
+                               "Informix:  Link to server lost, unable to reconnect (%s)",
+                               ifx_error(ifx));
+                    _php3_hash_del(plist, hashed_details, 
+                                   hashed_details_length+1);
+                    efree(hashed_details);
+                    RETURN_FALSE;
+                }
+            }
+            ifx = le->ptr;
+        }
+        return_value->value.lval = php3_list_insert(ifx,
+                               Informix_GLOBAL(php3_ifx_module).le_plink);
+        return_value->type = IS_LONG;
+    } 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 ifx link sits.
+         * if it doesn't, open a new ifx 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;
+
+            if (index_ptr->type != le_index_ptr) {
+                RETURN_FALSE;
+            }
+            link = (int) index_ptr->ptr;
+            ptr = php3_list_find(link,&type);   /* check if the link is still there */
+            if (ptr && (type==Informix_GLOBAL(php3_ifx_module).le_link ||
+                        type==Informix_GLOBAL(php3_ifx_module).le_plink)) {
+                return_value->value.lval = 
+                          Informix_GLOBAL(php3_ifx_module).default_link = 
+                          link;
+                return_value->type = IS_LONG;
+                efree(hashed_details);
+                return;
+            } else {
+                _php3_hash_del(list,hashed_details,hashed_details_length+1);
+            }
+        }
+        if (Informix_GLOBAL(php3_ifx_module).max_links != -1 && 
+            Informix_GLOBAL(php3_ifx_module).num_links >= 
+                             Informix_GLOBAL(php3_ifx_module).max_links) {
+            php3_error(E_WARNING,
+                       "Informix:  Too many open links (%d)",
+                       Informix_GLOBAL(php3_ifx_module).num_links);
+            efree(hashed_details);
+            RETURN_FALSE;
+        }
+        ifx = (char *) emalloc(sizeof(IFX));
+        Informix_GLOBAL(php3_ifx_module).connectionid++;        
+        sprintf(ifx,"connec%x", 
+                Informix_GLOBAL(php3_ifx_module).connectionid);
+
+        EXEC SQL CONNECT TO :host AS :ifx 
+             USER :user USING :passwd 
+             WITH CONCURRENT TRANSACTION;  
+        if (ifx_check() == IFX_ERROR) {
+            Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+            php3_error(E_WARNING,"ifx_pconnect : %s", ifx_error(ifx));
+            efree(hashed_details);
+            efree(ifx);
+            RETURN_FALSE;
+        }
+
+        /* add it to the list */
+        return_value->value.lval = 
+             php3_list_insert(ifx,Informix_GLOBAL(php3_ifx_module).le_link);
+        return_value->type = IS_LONG;
+        
+        /* add it to the hash */
+        new_index_ptr.ptr = (void *) return_value->value.lval;
+        new_index_ptr.type = le_index_ptr;
+        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;
+        }
+        Informix_GLOBAL(php3_ifx_module).num_links++;
+    }
+    efree(hashed_details);
+    Informix_GLOBAL(php3_ifx_module).default_link=return_value->value.lval;
+}
+/* }}} */
+
+
+void php3_ifx_connect(INTERNAL_FUNCTION_PARAMETERS)
+{
+    php3_ifx_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
+}
+
+void php3_ifx_pconnect(INTERNAL_FUNCTION_PARAMETERS)
+{
+    php3_ifx_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,1);
+}
+
+static int php3_ifx_get_default_link(INTERNAL_FUNCTION_PARAMETERS)
+{
+    Informix_TLS_VARS;
+
+    if (Informix_GLOBAL(php3_ifx_module).default_link==-1) { /* no link opened yet, implicitly open one */
+        HashTable tmp;
+        
+        _php3_hash_init(&tmp,0,NULL,NULL,0);
+        php3_ifx_do_connect(&tmp,return_value,list,plist,0);
+        _php3_hash_destroy(&tmp);
+    }
+    return Informix_GLOBAL(php3_ifx_module).default_link;
+}
+
+/* ----------------------------------------------------------------------
+** int ifx_close(int $connid)
+**
+** closes connection $connid 
+** always returns TRUE
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifx_close(int connid)
+   close informix connection */
+void php3_ifx_close(INTERNAL_FUNCTION_PARAMETERS)
+{
+    pval *ifx_link;
+    int id,type;
+
+EXEC SQL BEGIN DECLARE SECTION;
+    char *ifx;
+EXEC SQL END DECLARE SECTION;
+
+    Informix_TLS_VARS;
+
+
+    
+    switch (ARG_COUNT(ht)) {
+        case 0:
+            id = Informix_GLOBAL(php3_ifx_module).default_link;
+            break;
+        case 1:
+            if (getParameters(ht, 1, &ifx_link)==FAILURE) {
+                RETURN_FALSE;
+            }
+            convert_to_long(ifx_link);
+            id = ifx_link->value.lval;
+            break;
+        default:
+            WRONG_PARAM_COUNT;
+            break;
+    }
+    
+    Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+
+    ifx = (char *) php3_list_find(id,&type);
+    if (type!=Informix_GLOBAL(php3_ifx_module).le_link && 
+            type!=Informix_GLOBAL(php3_ifx_module).le_plink) {
+        php3_error(E_WARNING,
+                   "ifx_close : %d (type %d) is not an Informix link index",
+                   id, 
+                   type);
+        RETURN_FALSE;
+    }
+    
+    EXEC SQL SET CONNECTION :ifx;
+    EXEC SQL close database;
+    EXEC SQL DISCONNECT CURRENT;    
+
+    php3_list_delete(id);
+    RETURN_TRUE;
+}
+/* }}} */
+
+/* ----------------------------------------------------------------------
+** int ifx_query(string $query, int $connid, 
+**               int $cursortype, $blobidarray)
+** $cursortype and $blobidarray are optional
+** 
+** executes query $query on connection $connid
+** for select queries a cursor is declared and opened
+** non-select queries are "execute immediate"
+** select queries accept an optional cursortype param: 
+** IFX_SCROLL, IFX_HOLD (or'ed mask)
+** non-select queries accept an optional "blobarryid" parameter
+** blobsupport: mark the blob-column(s) with ? in the insert/update query 
+**   and add a blob-id-array-functionparameter
+** select queries return "blob-ids" for blob columns 
+**   except if text/byteasvarchar is set
+** example: ifx_query("insert into catalog (stock_num, manu_code, 
+**           cat_descr,cat_picture) values(1,'HRO',?,?)",$cid,$bidarray);
+** 
+** returns a "result id" on success or FALSE on error
+** also sets "affected_rows for retrieval by ifx_affected_rows()
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifx_query(string query, int connid, [int cursortype], [array idarray])
+   perform a query on a given connection */
+void php3_ifx_query(INTERNAL_FUNCTION_PARAMETERS)
+{
+    pval *query,*ifx_link, *cursortype, *dummy;
+    int id,type;
+    IFX_RES *Ifx_Result;
+    
+EXEC SQL BEGIN DECLARE SECTION;
+    char *ifx;                /* connection ID     */
+    char cursorid[32];        /* query cursor id   */
+    char statemid[32];        /* statement id      */
+    char descrpid[32];        /* descriptor id     */
+    char *statement;          /* query text        */
+    int  fieldcount;          /* field count       */
+    int  i;                   /* field index       */
+    short fieldtype;
+    loc_t *locator;
+    int loc_t_type=CLOCATORTYPE;  /* WORKAROUND:TYPE=CLOCATORTYPE doesn't work,  */
+    int sqlchar_type=SQLCHAR;     /* don't ask me, why. */
+    char *char_tmp;
+    long len;
+    int indicator;    
+$ifdef HAVE_IFX_IUS;
+    fixed binary 'blob' ifx_lo_t *slocator;
+$endif;
+
+EXEC SQL END DECLARE SECTION;
+
+    char *blobfilename;
+    int  locind;
+    int  ctype;
+    int  affected_rows;
+    int  query_type;
+    int  cursoryproc;
+        
+    Informix_TLS_VARS;
+
+    if(ARG_COUNT(ht)<2) {
+     WRONG_PARAM_COUNT;
+    }
+
+    Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+
+    /* get the first 2 parameters */
+    if (getParameters(ht, 2, &query, &ifx_link)==FAILURE) {
+       RETURN_FALSE;
+    }
+    convert_to_long(ifx_link);
+    id = ifx_link->value.lval;
+
+    ifx = (char *) php3_list_find(id,&type);
+    if (type != Informix_GLOBAL(php3_ifx_module).le_link && 
+            type!=Informix_GLOBAL(php3_ifx_module).le_plink) {
+        php3_error(E_WARNING,
+                   "ifx_query : %d (type %d) is not a Informix link index",
+                   id,
+                   type);
+        RETURN_FALSE;
+    }
+    
+    affected_rows = -1;      /* invalid */
+
+    convert_to_string(query);
+
+    statement = query->value.str.val;
+    Informix_GLOBAL(php3_ifx_module).cursorid++;    
+    sprintf(statemid, "statem%x", Informix_GLOBAL(php3_ifx_module).cursorid); 
+    sprintf(cursorid, "cursor%x", Informix_GLOBAL(php3_ifx_module).cursorid); 
+    sprintf(descrpid, "descrp%x", Informix_GLOBAL(php3_ifx_module).cursorid); 
+    
+    EXEC SQL set connection :ifx;
+    if (ifx_check() < 0) {
+        Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+        php3_error(E_WARNING,"Set connection %s fails (%s)",
+                              ifx,
+                              ifx_error(ifx));
+        RETURN_FALSE;
+    }
+    EXEC SQL PREPARE :statemid FROM :statement;
+    if (ifx_check() < 0) {
+        Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+        php3_error(E_WARNING,"Prepare fails (%s)",
+                              ifx_error(ifx));
+        RETURN_FALSE;
+    }
+    affected_rows = sqlca.sqlerrd[0];    /* save estimated affected rows */
+    EXEC SQL ALLOCATE DESCRIPTOR :descrpid WITH MAX 256;
+    if (ifx_check() < 0) {
+        Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+        php3_error(E_WARNING,"Allocate desciptor <%s> fails (%s)",
+                              descrpid,
+                              ifx_error(ifx));
+        EXEC SQL free :statemid;
+        RETURN_FALSE;
+    }
+    EXEC SQL DESCRIBE :statemid USING SQL DESCRIPTOR :descrpid;
+    if (ifx_check() < 0) {
+        Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+        php3_error(E_WARNING,"Describe fails (%s)",
+                              ifx_error(ifx));
+        EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
+        EXEC SQL free :statemid;
+        RETURN_FALSE;
+    }
+
+    query_type = sqlca.sqlcode;
+    
+    Ifx_Result = (IFX_RES *)emalloc(sizeof(IFX_RES));
+    if (Ifx_Result == NULL) { 
+        php3_error(E_WARNING,"Out of memory allocating IFX_RES");
+        EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
+        EXEC SQL free :statemid;
+        RETURN_FALSE;
+    }
+
+    /* initialize result data structure */
+
+    Ifx_Result->rowid = 0;
+    strcpy(Ifx_Result->connecid, ifx); 
+    strcpy(Ifx_Result->descrpid, descrpid);
+    for (i = 0; i < MAX_RESID; ++i)
+        Ifx_Result->res_id[i] = -1;
+    
+    cursoryproc = 0;
+    if (query_type == SQ_EXECPROC) {
+        EXEC SQL GET DESCRIPTOR :descrpid :i = COUNT;
+        if (i > 0) {
+            cursoryproc = 1;
+        } 
+    }
+
+    Ifx_Result->iscursory = -1; /* prevent ifx_do */
+    Ifx_Result->paramquery=0;  
+    
+    if ((query_type != 0) && (!cursoryproc)) {  /* NO RESULT SET */
+      /* ##
+         ## NONSELECT-STATEMENT 
+         ##
+      */
+      pval *pblobidarr, *tmp;
+
+      Ifx_Result->iscursory = 0;
+      
+      strcpy(Ifx_Result->cursorid, "");
+      strcpy(Ifx_Result->descrpid, descrpid);
+      strcpy(Ifx_Result->statemid, statemid);
+
+      if(ARG_COUNT(ht)>3) {
+         WRONG_PARAM_COUNT;      
+      }
+
+      if(ARG_COUNT(ht)==3) {
+          getParameters(ht, ARG_COUNT(ht), &dummy,&dummy,&pblobidarr);
+          if (pblobidarr->type != IS_ARRAY) {
+              php3_error(E_WARNING,"blob-parameter not an array");
+              EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
+              EXEC SQL free :statemid;
+              efree(Ifx_Result);
+              RETURN_FALSE;
+          }
+
+          _php3_hash_internal_pointer_reset(pblobidarr->value.ht);
+          i=1;
+          while (_php3_hash_get_current_data(pblobidarr->value.ht, 
+                                           (void **) &tmp) == SUCCESS) {
+              convert_to_long(tmp);
+              if ((query_type == SQ_UPDATE) || (query_type == SQ_UPDALL)) {
+                   EXEC SQL SET DESCRIPTOR :descrpid COUNT = :i;
+               }
+              /* TEXT/BYTE */
+ 	      if(php3_intifx_getType((int)tmp->value.lval,list)==TYPE_BLTEXT || php3_intifx_getType((int)tmp->value.lval,list)==TYPE_BLBYTE) {
+               locator=php3_intifx_get_blobloc((int)tmp->value.lval,list);
+               if(locator==NULL) {
+                   php3_error(E_WARNING,"%d is not a Informix blob-result index",
+                              (int)tmp->value.lval);
+                   EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
+                   EXEC SQL free :statemid;
+                   efree(Ifx_Result);
+                   RETURN_FALSE;
+               }
+               if(locator->loc_loctype==LOCFNAME) {       
+                   locator->loc_oflags=LOC_RONLY;
+               }
+               EXEC SQL SET DESCRIPTOR :descrpid VALUE :i 
+                                        DATA= :*locator, 
+                                        TYPE= :loc_t_type;
+              }
+              
+              /* CHAR */
+              if(php3_intifx_getType((int)tmp->value.lval,list)==TYPE_CHAR) {
+               len=php3_intifx_get_char((int)tmp->value.lval,list,&char_tmp);
+               indicator=0;
+               if(char_tmp==NULL || len<0)
+                indicator=-1;
+               len++;
+               EXEC SQL SET DESCRIPTOR :descrpid VALUE :i 
+                                        DATA= :char_tmp,
+                                        LENGTH= :len, 
+                                        INDICATOR= :indicator,
+                                        TYPE= :sqlchar_type;
+              }
+              
+              
+              i++;
+              _php3_hash_move_forward(pblobidarr->value.ht);
+          }
+          Ifx_Result->paramquery=1;  
+          EXEC SQL EXECUTE :statemid USING SQL DESCRIPTOR :descrpid;
+      } else {
+          EXEC SQL EXECUTE :statemid;
+      }
+      if (ifx_check() < 0) {
+        Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+        php3_error(E_WARNING,"Execute immediate fails : %s (%s)",
+                                 statement,
+                                 ifx_error(ifx));
+        efree(Ifx_Result);
+        EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
+        EXEC SQL free :statemid;
+        RETURN_FALSE;
+       }
+       Ifx_Result->affected_rows = sqlca.sqlerrd[2]; /* really affected */
+    } else {
+      /* ##
+         ** SELECT-STATEMENT 
+         **
+      */
+
+      ctype = 0;   /* preset */
+
+      switch(ARG_COUNT(ht)) {
+       case 2:
+         break;
+       case 3:
+         if (getParameters(ht, 3, 
+                              &dummy, 
+                              &dummy,
+                              &cursortype)==FAILURE) {
+                RETURN_FALSE;
+         }
+         convert_to_long(cursortype);
+         ctype = cursortype->value.lval;
+         break;
+       default:
+         WRONG_PARAM_COUNT;
+         break;
+      }
+            
+
+
+        Ifx_Result->affected_rows = affected_rows;   /* saved estimated */
+        EXEC SQL GET DESCRIPTOR :descrpid :fieldcount = COUNT;
+        if (ifx_check() < 0) {
+            Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+            php3_error(E_WARNING,"Can not get descriptor %s (%s)",
+                                  descrpid,
+                                  ifx_error(ifx));
+            EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
+            EXEC SQL free :statemid;
+            efree(Ifx_Result);
+            RETURN_FALSE;
+        }
+        Ifx_Result->numcols = fieldcount;
+
+        Ifx_Result->isscroll = Ifx_Result->ishold = 0;
+        if (ctype & IFX_SCROLL)
+            Ifx_Result->isscroll = 1;
+        if (ctype & IFX_HOLD)
+            Ifx_Result->ishold = 1;
+
+        if (Ifx_Result->isscroll) 
+            if (Ifx_Result->ishold) 
+               EXEC SQL DECLARE :cursorid SCROLL CURSOR WITH HOLD FOR :statemid;
+            else
+               EXEC SQL DECLARE :cursorid SCROLL CURSOR FOR :statemid;
+        else
+            if (Ifx_Result->ishold)
+               EXEC SQL DECLARE :cursorid CURSOR WITH HOLD FOR :statemid;
+            else
+               EXEC SQL DECLARE :cursorid CURSOR FOR :statemid;
+                
+        if (ifx_check() < 0) {
+            Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+            php3_error(E_WARNING,"Declare cursor fails (%s)", ifx_error(ifx));
+            efree(Ifx_Result);
+            EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
+            EXEC SQL free :statemid;
+            RETURN_FALSE;
+        }
+        EXEC SQL OPEN :cursorid;
+        if (ifx_check() < 0) {
+            Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+            php3_error(E_WARNING,"Open cursor fails (%s)", ifx_error(ifx));
+            efree(Ifx_Result);
+            EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
+            EXEC SQL free :statemid;
+            EXEC SQL free :cursorid;
+            RETURN_FALSE;
+        }
+        strcpy(Ifx_Result->cursorid, cursorid);
+        strcpy(Ifx_Result->descrpid, descrpid);
+        strcpy(Ifx_Result->statemid, statemid);
+        
+        /* check for text/blob columns */
+        
+
+        locind = 0;
+        for (i = 1; i <= fieldcount; ++i) {
+           EXEC SQL GET DESCRIPTOR :descrpid VALUE :i  :fieldtype = TYPE;
+           if (
+               (fieldtype == SQLTEXT) || (fieldtype == SQLBYTES)
+$ifdef HAVE_IFX_IUS;
+               || (fieldtype==SQLUDTFIXED)
+$endif;
+                ) {
+            
+               int bid;
+               if(fieldtype==SQLTEXT) {
+                   bid=php3_intifx_create_blob(TYPE_BLTEXT,BLMODE_INMEM,"",-1,list);
+                   locator=php3_intifx_get_blobloc(bid,list);
+                   EXEC SQL SET DESCRIPTOR :descrpid VALUE :i DATA = :*locator;
+               } 
+               if(fieldtype==SQLBYTES) {
+                   if(Informix_GLOBAL(php3_ifx_module).blobinfile==0) {
+                       bid=php3_intifx_create_blob(TYPE_BLBYTE,BLMODE_INMEM,"",-1,list);
+                       locator=php3_intifx_get_blobloc(bid,list);
+                   } else {
+                       blobfilename=php3_intifx_create_tmpfile(i);
+                       bid=php3_intifx_create_blob(
+                                      TYPE_BLBYTE,BLMODE_INFILE,
+                                      blobfilename,strlen(blobfilename),list);
+                       locator=php3_intifx_get_blobloc(bid,list);
+                       locator->loc_oflags=LOC_WONLY;
+                   }
+                   EXEC SQL SET DESCRIPTOR :descrpid VALUE :i DATA = :*locator;
+                } 
+$ifdef HAVE_IFX_IUS;
+               if(fieldtype==SQLUDTFIXED) {
+                   bid=php3_intifxus_new_slob(list);
+                   slocator=php3_intifxus_get_slobloc(bid,list);
+                   EXEC SQL SET DESCRIPTOR :descrpid VALUE :i DATA = :*slocator;  
+                } 
+$endif;
+                Ifx_Result->res_id[locind]=bid;
+                ++locind;
+            }
+        }
+                
+    }
+
+
+    RETURN_LONG(php3_list_insert(Ifx_Result,Informix_GLOBAL(php3_ifx_module).le_result));
+}
+/* }}} */
+
+
+/* ----------------------------------------------------------------------
+** int ifx_prepare(string $query, int $connid, 
+**                 int $cursortype, array $blobidarry)
+**
+** $hold, $scroll are optional and valid only for select queries
+** $blobidarray is optional, an array of blob id's
+**
+** prepares query $query on connection $connid
+** select queries accept an optional cursortype param: IFX_SCROLL, IFX_HOLD (or'ed mask)
+** blobsupport: mark the blob-column with ? and add a blob-id-functionparameter
+** example: ifx_query("insert into catalog (stock_num, manu_code ,cat_descr,
+**                    cat_picture) values(1,'HRO',?,?)",$cid,$bid1,$bid2);
+** 
+** returns a "result id" on success or FALSE on error
+** also sets "affected_rows for retrieval by ifx_affected_rows
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifx_prepare(string query, int connid, [int cursortype], [array idarray])
+   prepare a query on a given connection */
+void php3_ifx_prepare(INTERNAL_FUNCTION_PARAMETERS)
+{
+   
+    pval *query,*ifx_link, *cursortype, *dummy;
+    int id,type;
+    IFX_RES *Ifx_Result;
+    
+EXEC SQL BEGIN DECLARE SECTION;
+    char *ifx;                /* connection ID     */
+    char cursorid[32];        /* query cursor id   */
+    char statemid[32];        /* statement id      */
+    char descrpid[32];        /* descriptor id     */
+    char *statement;          /* query text        */
+    int  fieldcount;          /* field count       */
+    int  i;                   /* field index       */
+    short fieldtype;
+    loc_t *locator;
+    int loc_t_type=CLOCATORTYPE; /* WORKAROUND: TYPE=CLOCATORTYPE doesn't work, */
+    int sqlchar_type=SQLCHAR;     /* don't ask me, why. */
+    char *char_tmp;
+    long len;
+    int indicator;    
+
+$ifdef HAVE_IFX_IUS;
+    fixed binary 'blob' ifx_lo_t *slocator;
+$endif;
+
+EXEC SQL END DECLARE SECTION;
+
+    char *blobfilename;
+    int  locind;
+    int  ctype;
+    int  affected_rows;
+    int  query_type;
+    int  cursoryproc;
+    
+    Informix_TLS_VARS;
+
+    if(ARG_COUNT(ht)<2) {
+     WRONG_PARAM_COUNT;
+    }
+
+    Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+
+    /* get the first 2 parameters */
+    if (getParameters(ht, 2, &query, &ifx_link)==FAILURE) {
+       RETURN_FALSE;
+    }
+    convert_to_long(ifx_link);
+    id = ifx_link->value.lval;
+    
+    ifx = (char *) php3_list_find(id,&type);
+    if (type != Informix_GLOBAL(php3_ifx_module).le_link && 
+            type!=Informix_GLOBAL(php3_ifx_module).le_plink) {
+        php3_error(E_WARNING,
+                   "ifx_query : %d (type %d) is not a Informix link index",
+                   id,
+                   type);
+        RETURN_FALSE;
+    }
+    
+    affected_rows = -1;      /* invalid */
+
+
+    convert_to_string(query);
+
+    statement = query->value.str.val;
+    Informix_GLOBAL(php3_ifx_module).cursorid++;    
+    sprintf(statemid, "statem%x", Informix_GLOBAL(php3_ifx_module).cursorid); 
+    sprintf(cursorid, "cursor%x", Informix_GLOBAL(php3_ifx_module).cursorid); 
+    sprintf(descrpid, "descrp%x", Informix_GLOBAL(php3_ifx_module).cursorid); 
+    
+    EXEC SQL set connection :ifx;
+    if (ifx_check() < 0) {
+        Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+        php3_error(E_WARNING,"Set connection %s fails (%s)",
+                              ifx,
+                              ifx_error(ifx));
+        RETURN_FALSE;
+    }
+    EXEC SQL PREPARE :statemid FROM :statement;
+    if (ifx_check() < 0) {
+        Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+        php3_error(E_WARNING,"Prepare fails (%s)",
+                              ifx_error(ifx));
+        RETURN_FALSE;
+    }
+    affected_rows = sqlca.sqlerrd[0];    /* save estimated affected rows */
+    EXEC SQL ALLOCATE DESCRIPTOR :descrpid WITH MAX 256;
+    if (ifx_check() < 0) {
+        Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+        php3_error(E_WARNING,"Allocate desciptor <%s> fails (%s)",
+                              descrpid,
+                              ifx_error(ifx));
+        EXEC SQL free :statemid;
+        RETURN_FALSE;
+    }
+    EXEC SQL DESCRIBE :statemid USING SQL DESCRIPTOR :descrpid;
+    if (ifx_check() < 0) {
+        Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+        php3_error(E_WARNING,"Describe fails (%s)",
+                              ifx_error(ifx));
+        EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
+        EXEC SQL free :statemid;
+        RETURN_FALSE;
+    }
+
+    query_type = sqlca.sqlcode;
+    
+    Ifx_Result = (IFX_RES *)emalloc(sizeof(IFX_RES));
+    if (Ifx_Result == NULL) { 
+        Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+        php3_error(E_WARNING,"Out of memory allocating IFX_RES");
+        EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
+        EXEC SQL free :statemid;
+        RETURN_FALSE;
+    }
+
+    /* initialize result data structure */
+
+    Ifx_Result->rowid = 0;
+    strcpy(Ifx_Result->connecid, ifx); 
+    strcpy(Ifx_Result->descrpid, descrpid);
+    strcpy(Ifx_Result->statemid, statemid);
+    for (i = 0; i < MAX_RESID; ++i)
+        Ifx_Result->res_id[i] = -1;
+  
+    cursoryproc = 0;
+    if (query_type == SQ_EXECPROC) {
+        EXEC SQL GET DESCRIPTOR :descrpid :i = COUNT;
+        if (i > 0) {
+            cursoryproc = 1;
+        }
+    }
+
+    Ifx_Result->iscursory = -1; /* prevent ifx_do */
+    Ifx_Result->paramquery=0;  
+
+    if ((query_type != 0) && (!cursoryproc)) {  /* NO RESULT SET */
+      /* ##
+         ## NONSELECT-STATEMENT 
+         ##
+      */
+      pval *pblobidarr, *tmp;
+
+      Ifx_Result->iscursory = 0;
+
+      strcpy(Ifx_Result->cursorid, cursorid);
+      strcpy(Ifx_Result->cursorid, "");
+      strcpy(Ifx_Result->descrpid, descrpid);
+
+
+      if(ARG_COUNT(ht)>3) {
+         WRONG_PARAM_COUNT;      
+      }
+      if(ARG_COUNT(ht)==3) {
+          Ifx_Result->paramquery=1;
+          getParameters(ht, ARG_COUNT(ht), &dummy,&dummy,&pblobidarr);
+          if(pblobidarr->type != IS_ARRAY) {
+              php3_error(E_WARNING,"blob-parameter not an array");
+              EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
+              EXEC SQL free :statemid;
+              efree(Ifx_Result);
+              RETURN_FALSE;
+           } 
+           _php3_hash_internal_pointer_reset(pblobidarr->value.ht);
+           i=1;
+           while (_php3_hash_get_current_data(pblobidarr->value.ht, 
+                                              (void **) &tmp) == SUCCESS) {
+              convert_to_long(tmp);
+              if ((query_type == SQ_UPDATE) || (query_type == SQ_UPDALL)) {
+                  EXEC SQL SET DESCRIPTOR :descrpid COUNT = :i;
+              }
+              /* TEXT/BYTE */
+ 	      if(php3_intifx_getType((int)tmp->value.lval,list)==TYPE_BLTEXT || php3_intifx_getType((int)tmp->value.lval,list)==TYPE_BLBYTE) {
+                locator=php3_intifx_get_blobloc((int)tmp->value.lval,list);
+                if(locator==NULL) {
+                    php3_error(E_WARNING,"%d is not a Informix blob-result index",
+                               (int)tmp->value.lval);
+                    EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
+                    EXEC SQL free :statemid;
+                    efree(Ifx_Result);
+                    RETURN_FALSE;
+                }
+                if(locator->loc_loctype==LOCFNAME) {       
+                    locator->loc_oflags=LOC_RONLY;
+                }
+                EXEC SQL SET DESCRIPTOR :descrpid VALUE :i 
+                                        DATA= :*locator, 
+                                        TYPE=:loc_t_type; 
+              }
+              /* CHAR */
+              if(php3_intifx_getType((int)tmp->value.lval,list)==TYPE_CHAR) {
+               len=php3_intifx_get_char((int)tmp->value.lval,list,&char_tmp);
+               indicator=0;
+               if(char_tmp==NULL || len<0)
+                indicator=-1;
+               len++;
+               EXEC SQL SET DESCRIPTOR :descrpid VALUE :i 
+                                        DATA= :char_tmp,
+                                        LENGTH= :len, 
+                                        INDICATOR= :indicator,
+                                        TYPE= :sqlchar_type;
+              }
+               
+              i++;
+              _php3_hash_move_forward(pblobidarr->value.ht);
+            } /* while */
+      } /* if paramquery */
+      Ifx_Result->affected_rows = affected_rows;   /* saved estimated */
+     } else {
+      /* ##
+         ** SELECT-STATEMENT 
+         **
+      */
+
+      ctype = 0;;   /* preset */
+
+      switch(ARG_COUNT(ht)) {
+       case 2:
+         break;
+       case 3:
+         if (getParameters(ht, 3, 
+                              &dummy, 
+                              &dummy,
+                              &cursortype)==FAILURE) {
+                RETURN_FALSE;
+         }
+         convert_to_long(cursortype);
+         ctype = cursortype->value.lval;
+         break;
+       default:
+         WRONG_PARAM_COUNT;
+         break;
+      } /* case */
+        strcpy(Ifx_Result->cursorid, cursorid);
+
+        Ifx_Result->iscursory = 1;
+        Ifx_Result->affected_rows = affected_rows;   /* saved estimated */
+        EXEC SQL GET DESCRIPTOR :descrpid :fieldcount = COUNT;
+        if (ifx_check() < 0) {
+            Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+            php3_error(E_WARNING,"Can not get descriptor %s (%s)",
+                                  descrpid,
+                                  ifx_error(ifx));
+            EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
+            EXEC SQL free :statemid;
+            efree(Ifx_Result);
+            RETURN_FALSE;
+        }
+        Ifx_Result->numcols = fieldcount;
+
+        Ifx_Result->isscroll = Ifx_Result->ishold = 0;
+        if (ctype & IFX_SCROLL)
+            Ifx_Result->isscroll = 1;
+        if (ctype & IFX_HOLD)
+            Ifx_Result->ishold = 1;
+
+   } /* if select */
+
+   RETURN_LONG(php3_list_insert(Ifx_Result,Informix_GLOBAL(php3_ifx_module).le_result));
+}
+/* }}} */
+
+/* ----------------------------------------------------------------------
+** int ifx_do(int $resultid)
+** 
+** executes a previously prepared query or opens a cursor for it
+**
+** returns TRUE on success, false on error
+** does NOT free $resultid on error !!!
+** 
+** also sets (real) affected_rows  for non-select statements
+** for retrieval by ifx_affected_rows
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifx_do(int resultid)
+   executes a previously prepared query or opens a cursor for it */
+void php3_ifx_do(INTERNAL_FUNCTION_PARAMETERS)
+{
+    pval *result;
+    int type;
+    IFX_RES *Ifx_Result;
+
+EXEC SQL BEGIN DECLARE SECTION;
+    char *ifx;                /* connection ID     */
+    char *cursorid;           /* query cursor id   */
+    char *statemid;           /* statement id      */
+    char *descrpid;           /* descriptor id     */
+    int  fieldcount;          /* field count       */
+    int  i;                   /* field index       */
+    short fieldtype;
+    loc_t *locator;
+
+$ifdef HAVE_IFX_IUS;
+    fixed binary 'blob' ifx_lo_t *slocator;
+$endif;
+
+EXEC SQL END DECLARE SECTION;
+
+    int  locind;
+    char *blobfilename;
+    char *blobdir;
+    
+    Informix_TLS_VARS;
+
+    switch(ARG_COUNT(ht)) {
+        case 0:
+            WRONG_PARAM_COUNT;
+            break;
+        case 1:
+            if (getParameters(ht, 1, &result)==FAILURE) {
+                RETURN_FALSE;
+            }
+            convert_to_long(result);
+            Ifx_Result = (IFX_RES *) php3_list_find(result->value.lval,&type);
+            break;
+        default:
+            WRONG_PARAM_COUNT;
+            break;
+    }
+    
+    Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+    
+    if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+        php3_error(E_WARNING,"%d is not an Informix result index",
+                   result->value.lval);
+        RETURN_FALSE;
+    }
+
+    ifx        = Ifx_Result->connecid;
+    cursorid   = Ifx_Result->cursorid;
+    statemid   = Ifx_Result->statemid;
+    descrpid   = Ifx_Result->descrpid;
+    fieldcount = Ifx_Result->numcols;
+
+    
+    if (Ifx_Result->iscursory < 0) {
+        php3_error(E_WARNING, "Resultindex %d is not a prepared query",
+                   result->value.lval);
+        RETURN_FALSE;
+    }
+    if (Ifx_Result->iscursory==0) {        /* execute immediate */
+        if(Ifx_Result->paramquery!=0) {
+           EXEC SQL EXECUTE :statemid USING SQL DESCRIPTOR :descrpid;
+        } else {
+           EXEC SQL EXECUTE :statemid;
+        }
+        if (ifx_check() < 0) {
+            Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+            php3_error(E_WARNING,"Execute immediate fails : %s ",
+                                  ifx_error(ifx));
+            RETURN_FALSE;
+        }
+        Ifx_Result->affected_rows = sqlca.sqlerrd[2]; /* really affected */
+    } else {                                /* open cursor */
+        if (Ifx_Result->isscroll) 
+            if (Ifx_Result->ishold) 
+               EXEC SQL DECLARE :cursorid SCROLL CURSOR WITH HOLD FOR :statemid;
+            else
+               EXEC SQL DECLARE :cursorid SCROLL CURSOR FOR :statemid;
+        else
+            if (Ifx_Result->ishold)
+               EXEC SQL DECLARE :cursorid CURSOR WITH HOLD FOR :statemid;
+            else
+               EXEC SQL DECLARE :cursorid CURSOR FOR :statemid;
+
+        if (ifx_check() < 0) {
+            Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+            php3_error(E_WARNING,"Declare cursor fails (%s)", ifx_error(ifx));
+            RETURN_FALSE;
+        }
+        EXEC SQL OPEN :cursorid;
+        if (ifx_check() < 0) {
+            Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+            php3_error(E_WARNING,"Open cursor fails (%s)", ifx_error(ifx));
+            RETURN_FALSE;
+        }
+        
+        /* check for text/blob columns */
+
+
+        locind = 0;
+        for (i = 1; i <= fieldcount; ++i) {
+           EXEC SQL GET DESCRIPTOR :descrpid VALUE :i  :fieldtype = TYPE;
+           if (
+               (fieldtype == SQLTEXT) || (fieldtype == SQLBYTES) 
+$ifdef HAVE_IFX_IUS;
+               || (fieldtype==SQLUDTFIXED)
+$endif;
+               ) {
+            
+               int bid;
+               if(fieldtype==SQLTEXT) {
+                   bid=php3_intifx_create_blob(TYPE_BLTEXT,BLMODE_INMEM,"",-1,list);
+                   locator=php3_intifx_get_blobloc(bid,list);
+                   EXEC SQL SET DESCRIPTOR :descrpid VALUE :i DATA = :*locator;
+               } 
+               if(fieldtype==SQLBYTES) {
+                   if(Informix_GLOBAL(php3_ifx_module).blobinfile==0) {
+                       bid=php3_intifx_create_blob(TYPE_BLBYTE,BLMODE_INMEM,"",-1,list);
+                       locator=php3_intifx_get_blobloc(bid,list);
+                   } else {
+                       blobfilename=php3_intifx_create_tmpfile(i);
+                       bid=php3_intifx_create_blob(
+                                TYPE_BLBYTE,BLMODE_INFILE,
+                                blobfilename,strlen(blobfilename),list);
+                       locator=php3_intifx_get_blobloc(bid,list);
+                       locator->loc_oflags=LOC_WONLY;
+                   }
+                   EXEC SQL SET DESCRIPTOR :descrpid VALUE :i DATA = :*locator;
+                } 
+$ifdef HAVE_IFX_IUS;
+               if(fieldtype==SQLUDTFIXED) {
+                   bid=php3_intifxus_new_slob(list);
+                   slocator=php3_intifxus_get_slobloc(bid,list);
+                   EXEC SQL SET DESCRIPTOR :descrpid VALUE :i DATA = :*slocator;  
+                } 
+$endif;
+                Ifx_Result->res_id[locind]=bid;
+                ++locind;
+            }
+        }
+                         
+    } /* end open cursor */
+
+    RETURN_TRUE;
+
+}
+/* }}} */
+
+
+
+
+/* ----------------------------------------------------------------------
+** string ifx_error([int connection_id]);
+**
+** returns the Informix error codes (SQLSTATE & SQLCODE)
+**
+** connection id is not checked, but remains for compatibility
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto string ifx_error();
+   returns the Informix error codes (SQLSTATE & SQLCODE) */
+void php3_ifx_error(INTERNAL_FUNCTION_PARAMETERS)
+{
+    pval *ifx_link;
+    int id,type;
+    IFX *ifx;
+    Informix_TLS_VARS;
+
+    
+    switch(ARG_COUNT(ht)) {
+        case 0:
+            id = Informix_GLOBAL(php3_ifx_module).default_link;
+            break;
+        case 1:
+            if (getParameters(ht, 1, &ifx_link)==FAILURE) {
+                RETURN_FALSE;
+            }
+            convert_to_long(ifx_link);
+            id = ifx_link->value.lval;
+            break;
+        default:
+            WRONG_PARAM_COUNT;
+            break;
+    }
+    
+/*  connection id is no longer checked 
+*    ifx = (IFX *) php3_list_find(id,&type);
+*    if (type!=Informix_GLOBAL(php3_ifx_module).le_link 
+*                        && type!=Informix_GLOBAL(php3_ifx_module).le_plink) {
+*        php3_error(E_WARNING,
+*                   "ifx_error : %d (type %d) is not an Informix link index",
+*                   id,
+*                   type);
+*     }
+*/  
+    RETURN_STRING(ifx_error(0),0); /* ifx_error returns emalloced string */
+}
+/* }}} */
+
+/* ----------------------------------------------------------------------
+** string ifx_errormsg([int errorcode])
+**
+** returns the Informix errormessage associated with 
+** the most recent Informix error if SQLCODE is nonzero, or,
+** when the optional "errocode" param is present, the errormessage 
+** corresponding to "errorcode".
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto string ifx_errormsg([int errorcode])
+   returns the Informix errormessage associated with  */
+void php3_ifx_errormsg(INTERNAL_FUNCTION_PARAMETERS)
+{
+    pval *errcode;
+
+    int ifx_errorcode;
+    int msglen, maxmsglen;
+    char *ifx_errmsg;
+    char * returnmsg;
+
+    Informix_TLS_VARS;
+    
+    switch(ARG_COUNT(ht)) {
+        case 0:
+            if (Informix_GLOBAL(php3_ifx_module).sv_sqlcode == 0)
+                ifx_errorcode = SQLCODE;
+            else
+                ifx_errorcode = Informix_GLOBAL(php3_ifx_module).sv_sqlcode;
+            break;
+        case 1:
+            if (getParameters(ht, 1, &errcode)==FAILURE) {
+                RETURN_FALSE;
+            }
+            convert_to_long(errcode);
+            ifx_errorcode = errcode->value.lval;
+            break;
+        default:
+            WRONG_PARAM_COUNT;
+            break;
+    }
+
+    maxmsglen = 255;
+    ifx_errmsg = (char *)malloc(maxmsglen+1);
+    if (ifx_errorcode != 0) {
+         rgetlmsg(ifx_errorcode, ifx_errmsg, maxmsglen, &msglen);
+         if (msglen > maxmsglen) {
+             maxmsglen = msglen + 1;
+             free(ifx_errmsg);
+             ifx_errmsg = (char *)malloc(maxmsglen + 1);
+             rgetlmsg(ifx_errorcode, ifx_errmsg, maxmsglen, &msglen);
+         }
+    } else {
+         ifx_errmsg[0] = 0;
+    }
+
+    returnmsg = (char *) emalloc(strlen(ifx_errmsg) + 128);
+    sprintf(returnmsg,ifx_errmsg, sqlca.sqlerrm);
+    free(ifx_errmsg);
+     
+    RETURN_STRING(returnmsg,0);    /* do not dup, emalloced ! */
+}
+/* }}} */
+
+/* --------------------------------------------------------------
+** int ifx_affected_rows(int $resultid)
+**
+** returns the number of rows affected by query $resultid
+**
+** for selects : estimated number of rows (sqlerrd[0])
+** for insert/update/delete : real number (sqlerrd[2])
+** ---------------------------------------------------------------
+*/
+
+/* {{{ proto int ifx_affected_rows(int resultid)
+   returns the number of rows affected by query identified by resultid */
+void php3_ifx_affected_rows(INTERNAL_FUNCTION_PARAMETERS)
+{
+    pval *result;
+    int type;
+    IFX_RES *Ifx_Result;
+
+    Informix_TLS_VARS;
+
+    switch(ARG_COUNT(ht)) {
+        case 0:
+            WRONG_PARAM_COUNT;
+            break;
+        case 1:
+            if (getParameters(ht, 1, &result)==FAILURE) {
+                RETURN_FALSE;
+            }
+            convert_to_long(result);
+            Ifx_Result = (IFX_RES *) php3_list_find(result->value.lval,&type);
+            break;
+        default:
+            WRONG_PARAM_COUNT;
+            break;
+    }
+    
+    Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+    
+    if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+        php3_error(E_WARNING,"%d is not an Informix result index",
+                   result->value.lval);
+        RETURN_FALSE;
+    }
+    
+    return_value->value.lval = Ifx_Result->affected_rows;
+    return_value->type = IS_LONG;
+}
+/* }}} */
+
+/* ----------------------------------------------------------------------
+** array ifx_fetch_row(int $resultid, [mixed $position])
+**
+** fetches the next row, or if using a scroll cursor, and $position
+** is present, the row as given in $position, into an associative
+** array with the fieldnames as key
+**
+** returns FALSE on error
+**
+** $position can be : "FIRST", "NEXT", "LAST", "PREVIOUS", "CURRENT" 
+** or an absolute row number
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ array ifx_fetch_row(int resultid, [mixed position])
+   fetches the next row or <position> row if using a scroll cursor */
+void php3_ifx_fetch_row(INTERNAL_FUNCTION_PARAMETERS)
+{
+    pval *result, *position;
+    IFX_RES *Ifx_Result;
+
+EXEC SQL BEGIN DECLARE SECTION;
+    char *ifx;                /* connection ID    */
+    char *cursorid;           /* query cursor id  */
+    char *statemid;           /* statement id     */
+    char *descrpid;           /* descriptor id    */
+    char *statement;          /* query text       */
+    int  fieldcount;          /* field count      */
+    int   i;                  /* an index         */ 
+    char  fieldname[64];      /* fieldname        */
+    char  ifx_bug;            /* pad for ifx bug  */
+    short fieldtype;          /* field type       */
+    int   fieldleng;          /* field length     */
+    int   field_ind;          /* the field index  */
+    char  *field;             /* the field data   */
+
+$ifdef HAVE_IFX_IUS;
+    ifx_int8_t  int8_var;
+    lvarchar	*lvar_tmp;
+$endif;
+   
+    short      indicator;
+    int        int_data;
+    char       *char_data;
+    long       date_data;
+    interval   intvl_data = {0};
+    datetime   dt_data = {0};
+    decimal    dec_data = {0};
+    short      short_data;
+    loc_t      *locator, *locator_b;
+
+$ifdef HAVE_IFX_IUS;
+    fixed binary 'blob' ifx_lo_t *slocator;
+$endif;
+
+    float      float_data;
+    double     double_data;
+    int        fetch_row;
+EXEC SQL END DECLARE SECTION;
+
+    int type;
+    int num_fields;
+    int locind,bid,bid_b;
+    
+    char string_data[256];
+    long long_data;
+    char *p;
+    FILE *fp;
+    char *blobfilename;            
+
+    char *fetch_pos;
+
+    char *nullstr;
+    
+    Informix_TLS_VARS;
+
+    switch(ARG_COUNT(ht)) {
+        case 0:
+            WRONG_PARAM_COUNT;
+            break;
+        case 1:
+            if (getParameters(ht, 1, &result)==FAILURE) {
+                RETURN_FALSE;
+            }
+            convert_to_long(result);
+            Ifx_Result = (IFX_RES *) php3_list_find(result->value.lval,&type);
+            fetch_pos = NULL;
+            fetch_row = 0;
+            break;
+        case 2:
+            if (getParameters(ht, 2, &result, &position)==FAILURE) {
+                RETURN_FALSE;
+            }
+            convert_to_long(result);
+            Ifx_Result = (IFX_RES *) php3_list_find(result->value.lval,&type);
+            if (position->type != IS_STRING) {
+                fetch_pos = NULL;
+                fetch_row = position->value.lval;
+            } else {
+                fetch_pos = position->value.str.val;
+                fetch_row = 0;
+            }
+            break;
+        default:
+            WRONG_PARAM_COUNT;
+            break;
+    }
+    
+    nullstr=php3_intifx_null();
+
+    Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+    
+    if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+        php3_error(E_WARNING,"%d is not an Informix result index",
+                   result->value.lval);
+        RETURN_FALSE;
+    }
+    if (strcmp(Ifx_Result->cursorid,"") == 0) {
+        php3_error(E_WARNING,"Not a select cursor !");
+        RETURN_FALSE;
+    }
+    
+    ifx        = Ifx_Result->connecid;
+    cursorid   = Ifx_Result->cursorid;
+    statemid   = Ifx_Result->statemid;
+    descrpid   = Ifx_Result->descrpid;
+    fieldcount = Ifx_Result->numcols;
+
+    if (! Ifx_Result->isscroll) {    
+        EXEC SQL FETCH :cursorid USING SQL DESCRIPTOR :descrpid;
+    } else {
+        if (fetch_pos == NULL) {
+            if (fetch_row != 0) {
+                EXEC SQL FETCH ABSOLUTE :fetch_row
+                               :cursorid USING SQL DESCRIPTOR :descrpid;
+            } else {
+                EXEC SQL FETCH NEXT :cursorid USING SQL DESCRIPTOR :descrpid;
+            }
+        } else {
+            if (strcasecmp(fetch_pos,"NEXT") == 0) {
+               EXEC SQL FETCH NEXT :cursorid USING SQL DESCRIPTOR :descrpid;
+            } else {
+            if (strcasecmp(fetch_pos,"PREVIOUS") == 0) {
+               EXEC SQL FETCH PREVIOUS :cursorid USING SQL DESCRIPTOR :descrpid;
+            } else {
+            if (strcasecmp(fetch_pos,"FIRST") == 0) {
+               EXEC SQL FETCH FIRST :cursorid USING SQL DESCRIPTOR :descrpid;
+            } else {
+            if (strcasecmp(fetch_pos,"LAST") == 0) {
+               EXEC SQL FETCH LAST :cursorid USING SQL DESCRIPTOR :descrpid;
+            } else { 
+            if (strcasecmp(fetch_pos,"CURRENT") == 0) {
+               EXEC SQL FETCH CURRENT :cursorid USING SQL DESCRIPTOR :descrpid;
+            } else {
+               php3_error(E_WARNING, "invalid positioning arg on fetch");
+            }}}}}
+        }
+    }  
+   if(SQLCODE!=-451) {    
+    switch (ifx_check()) {
+        case IFX_ERROR:
+            Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+            php3_error(E_WARNING,
+                       "Can not fetch row on cursor %s (%s)",
+                       ifx_error(ifx),
+                       cursorid);
+            RETURN_FALSE;
+            break;
+        case IFX_NODATA:
+            RETURN_FALSE;
+            break;
+        default:
+            break;
+     }
+    }
+    Ifx_Result->rowid++;
+
+    if (array_init(return_value)==FAILURE) {
+        RETURN_FALSE;
+    }
+    num_fields = fieldcount;
+    
+    locind = 0;
+    for (i = 1; i <= num_fields; i++) {
+        EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :fieldtype = TYPE,
+                                                   :fieldname = NAME,
+                                                   :fieldleng = LENGTH,
+                                                   :indicator = INDICATOR;
+        if (ifx_check() < 0) {
+            Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+            php3_error(E_WARNING,"Get descriptor (field # %d) fails (%s)",
+                                 i,
+                                 ifx_error(ifx));
+            RETURN_FALSE;
+        }
+        
+        p = fieldname;         /* rtrim fieldname */
+        while ((*p != ' ') && (p < &fieldname[sizeof(fieldname) - 1])) ++p;
+        *p = 0;
+         
+        if (strcmp("(expression)", fieldname) == 0)	/* stored proc */
+            sprintf(fieldname, "[Expr_%d]", i);
+
+        if (indicator == -1) {        /* NULL */
+           if((Informix_GLOBAL(php3_ifx_module).textasvarchar==0 
+                                                  && fieldtype==SQLTEXT) 
+              || (Informix_GLOBAL(php3_ifx_module).byteasvarchar==0 
+                                                  && fieldtype==SQLBYTES)) {
+  
+              bid_b=Ifx_Result->res_id[locind];
+              bid=php3_intifx_copy_blob(bid_b, list);
+              php3_intifx_update_blob(bid,nullstr,strlen(nullstr),list);
+              add_assoc_long(return_value,fieldname,bid);
+              ++locind;
+              continue; 
+            }
+            if (
+                (fieldtype==SQLTEXT) || (fieldtype==SQLBYTES)
+$ifdef HAVE_IFX_IUS;
+                 || (fieldtype==SQLUDTFIXED)
+$endif;
+                ) {
+              ++locind;
+            }
+            add_assoc_string(return_value, fieldname, nullstr, DUP);
+            continue;
+        } /* NULL */
+        switch (fieldtype) {
+            case SQLSERIAL  : 
+            case SQLINT     :
+                EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :int_data = DATA;
+                long_data = int_data;
+                sprintf(string_data,"%ld", long_data); 
+                add_assoc_string(return_value, fieldname, string_data, DUP);
+                break;
+            case SQLSMINT   :
+                EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :short_data = DATA;
+                long_data = short_data;
+                sprintf(string_data,"%ld", long_data); 
+                add_assoc_string(return_value, fieldname, string_data, DUP);
+                break;
+            case SQLDECIMAL :
+            case SQLMONEY   :
+                EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :dec_data = DATA;
+                memset(string_data, 0x20, 64);
+                dectoasc(&dec_data, string_data, 63, -1);
+                for (p =string_data; *p != ' '; ++p) ;
+                *p = 0;                
+                add_assoc_string(return_value, fieldname, string_data, DUP);
+                break;
+            case SQLSMFLOAT :
+                EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :float_data = DATA;
+                double_data = float_data;
+                sprintf(string_data,"%17.17g", double_data);
+                add_assoc_string(return_value, fieldname, string_data, DUP);
+                break;
+            case SQLFLOAT   :
+                EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :double_data = DATA;
+                sprintf(string_data,"%17.17g", double_data);
+                add_assoc_string(return_value, fieldname, string_data, DUP);
+                break;
+            case SQLDATE    :
+                EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :date_data = DATA;
+                rdatestr(date_data, string_data); 
+                add_assoc_string(return_value, fieldname, string_data, DUP);
+                break;
+            case SQLDTIME   :
+                EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :dt_data = DATA;
+                dttoasc(&dt_data, string_data); 
+                add_assoc_string(return_value, fieldname, string_data, DUP);
+                break;
+            case SQLINTERVAL:
+                EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :intvl_data = DATA;
+                intoasc(&intvl_data, string_data); 
+                add_assoc_string(return_value, fieldname, string_data, DUP);
+                break;
+
+$ifdef HAVE_IFX_IUS;
+            case SQLSERIAL8   :
+            case SQLINT8   :
+                EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :int8_var = DATA;
+                ifx_int8toasc(&int8_var,string_data,200);
+                add_assoc_string(return_value, fieldname, string_data, DUP);
+                break;
+            case SQLLVARCHAR:
+            	ifx_var_flag(&lvar_tmp,1);
+                EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :lvar_tmp = DATA;
+
+		fieldleng=ifx_var_getlen(&lvar_tmp);
+                if ((char_data = (char *)emalloc(fieldleng + 1)) == NULL) {
+                    php3_error(E_WARNING, "Out of memory");
+                    RETURN_FALSE;
+                }
+                memcpy(char_data,ifx_var_getdata(&lvar_tmp),fieldleng);
+		ifx_var_dealloc(&lvar_tmp);
+                add_assoc_stringl(return_value, fieldname, char_data, fieldleng,0);
+                break;
+            case SQLBOOL:
+$endif;
+            case SQLVCHAR   :
+            case SQLNVCHAR  :
+            case SQLCHAR    :
+            case SQLNCHAR   :
+                if ((char_data = (char *)emalloc(fieldleng + 1)) == NULL) {
+                    php3_error(E_WARNING, "Out of memory");
+                    RETURN_FALSE;
+                }
+                EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :char_data = DATA;
+                if (Informix_GLOBAL(php3_ifx_module).charasvarchar != 0
+                     && (fieldtype == SQLCHAR || fieldtype == SQLNCHAR)) {
+                    ldchar(char_data, fieldleng, char_data);
+                }
+                add_assoc_string(return_value, fieldname, char_data, DUP);
+                efree(char_data);
+                char_data = NULL;
+                break;
+
+$ifdef HAVE_IFX_IUS;
+            case SQLUDTFIXED   :   
+                bid_b=Ifx_Result->res_id[locind];
+                add_assoc_long(return_value,fieldname,bid_b);
+
+                bid=php3_intifxus_new_slob(list);
+                slocator=php3_intifxus_get_slobloc(bid,list);
+                EXEC SQL SET DESCRIPTOR :descrpid VALUE :i DATA = :*slocator;  
+                Ifx_Result->res_id[locind]=bid;
+                ++locind;
+		break;
+$endif;
+		
+            case SQLBYTES   :   
+            case SQLTEXT    :        /* NULL has already been dealt with */   
+                bid_b=Ifx_Result->res_id[locind];
+                locator_b=php3_intifx_get_blobloc(bid_b,list); 
+                ++locind;
+
+                EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :*locator_b = DATA;
+                if (locator_b->loc_status < 0) {  /* blob too large */   
+                       php3_error(E_WARNING,"no memory (%d bytes) for blob",
+                                  locator_b->loc_bufsize);
+                       RETURN_FALSE;
+                }
+                                 /* copy blob */
+                bid=php3_intifx_copy_blob(bid_b, list);
+                                 /* and generate new tempfile for next row */
+                if(locator_b->loc_loctype==LOCFNAME) {
+                   blobfilename=php3_intifx_create_tmpfile(bid_b);
+                   php3_intifx_update_blob(bid_b,blobfilename,strlen(blobfilename),list);
+                   efree(blobfilename);
+                   EXEC SQL SET DESCRIPTOR :descrpid VALUE :i  
+                                           DATA= :*locator_b;
+                } 
+ 
+                                /* return blob as VARCHAR ?          */
+                                /* note that in case of "blobinfile" */
+                                /* you get the file name             */
+                                /* a new one for every row !         */
+                if((Informix_GLOBAL(php3_ifx_module).textasvarchar!=0 
+                                            && fieldtype==SQLTEXT) 
+                  || (Informix_GLOBAL(php3_ifx_module).byteasvarchar!=0 
+                                            && fieldtype==SQLBYTES)) {
+                   char *content;
+                   long lg;
+                   lg=php3_intifx_get_blob(bid, list, &content);
+                   if(content==NULL || lg<0) {
+                       add_assoc_string(return_value,fieldname,nullstr,DUP);
+                   } else {
+                       add_assoc_stringl(return_value,fieldname,content,lg,DUP);
+                   }
+                   php3_intifx_free_blob(bid, list);
+                   break;
+                } 
+                                  /* no, return as blob id */
+                add_assoc_long(return_value,fieldname,bid);
+                break;
+            default         :
+                sprintf(string_data,"ESQL/C : %s : unsupported field type[%d]",
+                        fieldname,
+                        fieldleng);
+                add_assoc_string(return_value, fieldname, string_data, DUP);
+                break;
+        }
+            
+        continue;
+    }    
+    
+   efree(nullstr);
+}
+/* }}} */
+
+
+
+/* ----------------------------------------------------------------------
+** int ifx_htmltbl_result(int $resultid, [string $htmltableoptions])
+**
+** formats all rows of the $resultid query into a html table
+** the optional second argument is a string of <table> tag options
+**
+** returns the number of rows printed or FALSE on error
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifx_htmltbl_result(int resultid, [string htmltableoptions])
+   formats all rows of the $resultid query into a html table */
+void php3_ifx_htmltbl_result(INTERNAL_FUNCTION_PARAMETERS)
+{
+    pval *result, *arg2;
+    IFX_RES *Ifx_Result;
+
+EXEC SQL BEGIN DECLARE SECTION;
+    char  *ifx;                 /* connection ID    */
+    char  *cursorid;            /* query cursor id  */
+    char  *statemid;            /* statement id     */
+    char  *descrpid;            /* descriptor id    */
+    char  *statement;           /* query text       */
+    int   fieldcount;           /* field count      */
+    int   i;                    /* an index         */ 
+    char  fieldname[64];        /* fieldname        */
+    short fieldtype;            /* field type       */
+    int   field_ind;            /* the field index  */
+    int   fieldleng;            /* field length     */
+    char  *field;               /* the field        */
+
+$ifdef HAVE_IFX_IUS;
+    ifx_int8_t  int8_var;
+    lvarchar	*lvar_tmp;
+$endif;
+
+    short     indicator;
+    int       int_data;
+    char      *char_data = NULL;
+    long      date_data;
+    interval  intvl_data = {0};
+    datetime  dt_data = {0};
+    decimal   dec_data = {0};
+    short     short_data;
+    float     float_data;
+    double    double_data;
+    loc_t     *locator_b;
+EXEC SQL END DECLARE SECTION;
+
+
+    char *content;
+    char *copy_content;
+    long lg;
+    
+    char *nullstr;
+                  
+    int type;
+    int num_fields;
+    
+    char string_data[256];
+    long long_data;
+    char *p;
+    int  locind,bid_b;
+    FILE *fp;
+    char *blobfilename;            
+    char *blobdir;
+    char *table_options;
+    int  moredata;
+    int bid;
+            
+    Informix_TLS_VARS;
+
+    switch (ARG_COUNT(ht)) {
+        case 1:
+            if (getParameters(ht, 1, &result)==FAILURE) {
+                RETURN_FALSE;
+            }
+            table_options = NULL;
+            break;
+        case 2:
+            if (getParameters(ht, 2, &result, &arg2)==FAILURE) {
+                RETURN_FALSE;
+            }
+            table_options = arg2->value.str.val;
+            break;
+        default:
+            WRONG_PARAM_COUNT;
+            break;
+    }
+    
+    Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+
+    convert_to_long(result);
+    Ifx_Result = (IFX_RES *) php3_list_find(result->value.lval,&type);
+    
+    if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+        php3_error(E_WARNING,
+                   "%d is not a Informix result index",result->value.lval);
+        RETURN_FALSE;
+    }
+
+    if (strcmp(Ifx_Result->cursorid,"") == 0) {
+        php3_error(E_WARNING,"Not a select cursor !");
+        RETURN_FALSE;
+    }
+
+    ifx        = Ifx_Result->connecid;
+    cursorid   = Ifx_Result->cursorid;
+    statemid   = Ifx_Result->statemid;
+    descrpid   = Ifx_Result->descrpid;
+    fieldcount = Ifx_Result->numcols;
+
+    /* try to fetch the first row */            
+    EXEC SQL FETCH :cursorid USING SQL DESCRIPTOR :descrpid;
+    switch (ifx_check()) {
+        case IFX_ERROR:
+            Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+            php3_error(E_WARNING,
+                       "Can not fetch next row on cursor %s (%s)",
+                       ifx_error(ifx),
+                       cursorid);
+            RETURN_FALSE;
+            break;
+        case IFX_NODATA:
+            moredata = 0;
+            break;
+        default:
+            Ifx_Result->rowid = moredata = 1;
+            break;
+    }
+    
+    if(! moredata) {
+        php3_printf("<h2>No rows found</h2>\n");
+        RETURN_LONG(0);
+    }
+    num_fields = fieldcount;
+    nullstr = php3_intifx_null();
+
+    /* start table tag */
+    if (table_options == NULL)
+        php3_printf("<table><tr>");
+    else
+        php3_printf("<table %s><tr>", table_options);
+
+    /* table headings */
+    for (i = 1; i <= num_fields; i++) {
+        EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :fieldname = NAME;
+        if (ifx_check() < 0) {
+            Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+            php3_error(E_WARNING,"Get descriptor (field # %d) fails (%s)",
+                                 i,
+                                 ifx_error(ifx));
+            RETURN_FALSE;
+        }
+            
+        p = fieldname;         /* Capitalize and rtrim fieldname */
+        *p = toupper(*p);
+        while ((*p != ' ') && (p < &fieldname[sizeof(fieldname) - 1])) ++p;
+        *p = 0;
+        if (strcmp("(expression)", fieldname) == 0)	/* stored proc */
+            sprintf(fieldname, "[Expr_%d]", i);
+        
+        php3_printf("<th>%s</th>", fieldname);
+    }    
+    php3_printf("</tr>\n");
+    
+    /* start spitting out rows untill none left */    
+    while (moredata) { 
+        printf("<tr>");
+        locind = 0;
+        for (i = 1; i <= num_fields; i++) {
+            EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :fieldtype = TYPE,
+                                                       :fieldleng = LENGTH,
+                                                       :indicator = INDICATOR;
+            if (ifx_check() < 0) {
+                Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+                php3_error(E_WARNING,"Get descriptor (field # %d) fails (%s)",
+                                     i,
+                                     ifx_error(ifx));
+                RETURN_FALSE;
+            }
+            
+            if (indicator == -1) {        /* NULL */
+                if(fieldtype==SQLTEXT || fieldtype==SQLBYTES) {
+                    ++locind;
+                }
+                php3_printf("<td>%s</td>", nullstr);
+                continue;
+            }
+            switch (fieldtype) {
+                case SQLSERIAL  : 
+                case SQLINT     :
+                    EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :int_data = DATA;
+                    long_data = int_data;
+                    sprintf(string_data,"%ld", long_data); 
+                    php3_printf("<td>%s</td>", string_data);
+                    break;
+                case SQLSMINT   :
+                    EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :short_data = DATA;
+                    long_data = short_data;
+                    sprintf(string_data,"%ld", long_data); 
+                    php3_printf("<td>%s</td>", string_data);
+                    break;
+                case SQLDECIMAL :
+                case SQLMONEY   :
+                    EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :dec_data = DATA;
+                    memset(string_data, 0x20, 64);
+                    dectoasc(&dec_data, string_data, 63, -1);
+                    for (p =string_data; *p != ' '; ++p) ;
+                    *p = 0;                
+                    php3_printf("<td>%s</td>", string_data);
+                    break;
+                case SQLSMFLOAT :
+                    EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :float_data = DATA;
+                    double_data = float_data;
+                    sprintf(string_data,"%17.17g", double_data);
+                    php3_printf("<td>%s</td>", string_data);
+                    break;
+                case SQLFLOAT   :
+                    EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :double_data = DATA;
+                    sprintf(string_data,"%17.17g", double_data);
+                    php3_printf("<td>%s</td>", string_data);
+                    break;
+                case SQLDATE    :
+                    EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :date_data = DATA;
+                    rdatestr(date_data, string_data); 
+                    php3_printf("<td>%s</td>", string_data);
+                    break;
+                case SQLDTIME   :
+                    EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :dt_data = DATA;
+                    dttoasc(&dt_data, string_data); 
+                    php3_printf("<td>%s</td>", string_data);
+                    break;
+                case SQLINTERVAL:
+                    EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :intvl_data = DATA;
+                    intoasc(&intvl_data, string_data); 
+                    php3_printf("<td>%s</td>", string_data);
+                    break;
+$ifdef HAVE_IFX_IUS;
+                case SQLSERIAL8:
+                case SQLINT8   :
+                    EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :int8_var = DATA;
+                    ifx_int8toasc(&int8_var,string_data,200);
+                    php3_printf("<td>%s</td>", string_data);
+                    break;
+                case SQLLVARCHAR:
+	            	ifx_var_flag(&lvar_tmp,1);
+        	        EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :lvar_tmp = DATA;
+
+			fieldleng=ifx_var_getlen(&lvar_tmp);
+        	        if ((char_data = (char *)emalloc(fieldleng + 1)) == NULL) {
+                	    php3_error(E_WARNING, "Out of memory");
+            	        RETURN_FALSE;
+             	   }
+                	memcpy(char_data,ifx_var_getdata(&lvar_tmp),fieldleng);
+			ifx_var_dealloc(&lvar_tmp);
+                	add_assoc_stringl(return_value, fieldname, char_data, fieldleng,0);
+                	break;
+
+                case SQLBOOL    :
+$endif;
+                case SQLCHAR    :
+                case SQLVCHAR   :
+                case SQLNCHAR   :
+                case SQLNVCHAR  :
+                    if ((char_data = (char *)emalloc(fieldleng + 1)) == NULL) {
+                        php3_error(E_WARNING, "Out of memory");
+                        RETURN_FALSE;
+                    }
+                    EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :char_data = DATA;
+                    if (Informix_GLOBAL(php3_ifx_module).charasvarchar != 0
+                          && (fieldtype == SQLCHAR || fieldtype == SQLNCHAR)) {
+                        ldchar(char_data, fieldleng, char_data);
+                    }
+                    php3_printf("<td>%s</td>", char_data);
+                    efree(char_data);
+                    char_data = NULL;
+                    break;
+                case SQLTEXT    :
+                                /* NULL has already been dealt with          */
+                                /* treated always as a long VARCHAR here     */
+                                /* if blobinbfile, too bad                   */
+                    bid_b=Ifx_Result->res_id[locind];
+                    ++locind;
+
+                    locator_b=php3_intifx_get_blobloc(bid_b,list); 
+                  
+                    EXEC SQL GET DESCRIPTOR :descrpid VALUE :i 
+                                            :*locator_b = DATA;
+                    if (locator_b->loc_status < 0) {  /* blob too large */   
+                        php3_error(E_WARNING,"no memory (%d bytes) for blob",
+                                   locator_b->loc_bufsize);
+                        RETURN_FALSE;
+                    }
+                    
+                                       /* get blob contents */    
+                    lg=php3_intifx_get_blob(bid_b, list, &content);
+                 
+                    if(content==NULL || lg<0) {
+                        php3_printf("<td>%s</td>", nullstr);
+                    } else {
+                                /* need an extra byte for string terminator */
+                        copy_content = malloc(lg + 1);
+                        if (copy_content == NULL) {
+                            php3_error(E_WARNING,"no memory for TEXT column");
+                            RETURN_FALSE;
+                        }
+                        memcpy(copy_content, content, lg);
+                        copy_content[lg]=0;
+                        php3_printf("<td>%s</td>", copy_content);
+                        free(copy_content);
+                    }
+                    break;
+
+                case SQLBYTES   : 
+                    ++locind;
+                    php3_printf("<td>(BYTE)</td>");
+                    break;                
+                default         :
+                     sprintf(string_data,
+                             "ESQL/C : %s : unsupported field type[%d]",
+                             fieldname,
+                             fieldleng);
+                     php3_printf("<td>%s</td>", string_data);
+                     break;
+            }
+                
+            continue;
+        }
+        php3_printf("</tr>\n");    
+        /* fetch next row */ 
+        EXEC SQL FETCH :cursorid USING SQL DESCRIPTOR :descrpid;
+        switch (ifx_check()) {
+            case IFX_ERROR:
+                Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+                php3_error(E_WARNING,
+                           "Can not fetch next row on cursor %s (%s)",
+                           ifx_error(ifx),
+                           cursorid);
+                RETURN_FALSE;
+                break;
+            case IFX_NODATA:
+                moredata = 0;
+                break;
+            default:
+                break;
+        }
+        Ifx_Result->rowid++;
+          
+    } /* endwhile (moredata); */    
+    php3_printf("</table>\n");
+    efree(nullstr);
+    RETURN_LONG(Ifx_Result->rowid);
+
+}
+/* }}} */
+
+/* ----------------------------------------------------------------------
+** array ifx_fieldtypes(int $resultid)
+**
+** returns an associative array with fieldnames as key
+** and SQL fieldtypes as data for query $resultid
+** 
+** returns FALSE on error
+** ----------------------------------------------------------------------
+*/
+
+
+/* {{{ proto array ifx_fieldtypes(int resultid)
+   returns an associative array with fieldnames as key for query <resultid> */
+void php3_ifx_fieldtypes(INTERNAL_FUNCTION_PARAMETERS)
+{
+    pval *result, *arg2;
+    IFX_RES *Ifx_Result;
+
+EXEC SQL BEGIN DECLARE SECTION;
+    char  *ifx;                 /* connection ID    */
+    char  *cursorid;            /* query cursor id  */
+    char  *statemid;            /* statement id     */
+    char  *descrpid;            /* descriptor id    */
+    char  *statement;           /* query text       */
+    int   fieldcount;           /* field count      */
+    int   i;                    /* an index         */ 
+    char  fieldname[64];        /* fieldname        */
+    short fieldtype;            /* field type       */
+    int   field_ind;            /* the field index  */
+    int   fieldleng;            /* field length     */
+    char  *field;               /* the field        */
+
+    short     indicator;
+    int       int_data;
+    char      *char_data = NULL;
+    long      date_data;
+    interval  intvl_data = {0};
+    datetime  dt_data = {0};
+    decimal   dec_data = {0};
+    short     short_data;
+    float     float_data;
+    double    double_data;
+    loc_t     *locator;
+EXEC SQL END DECLARE SECTION;
+
+    int type;
+    int num_fields;
+    
+    char string_data[256];
+    long long_data;
+    char *p;
+    int  locind;
+    FILE *fp;
+    char *blobfilename;            
+    char *blobdir;
+    char *table_options;
+    int  moredata;
+            
+    Informix_TLS_VARS;
+
+    switch (ARG_COUNT(ht)) {
+        case 1:
+            if (getParameters(ht, 1, &result)==FAILURE) {
+                RETURN_FALSE;
+            }
+            table_options = NULL;
+            break;
+        case 2:
+            if (getParameters(ht, 2, &result, &arg2)==FAILURE) {
+                RETURN_FALSE;
+            }
+            table_options = arg2->value.str.val;
+            break;
+        default:
+            WRONG_PARAM_COUNT;
+            break;
+    }
+    
+    Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+    
+    convert_to_long(result);
+    Ifx_Result = (IFX_RES *) php3_list_find(result->value.lval,&type);
+    
+    if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+        php3_error(E_WARNING,
+                   "%d is not a Informix result index",result->value.lval);
+        RETURN_FALSE;
+    }
+
+    if (strcmp(Ifx_Result->cursorid,"") == 0) {
+        php3_error(E_WARNING,"Not a select cursor !");
+        RETURN_FALSE;
+    }
+
+    ifx        = Ifx_Result->connecid;
+    cursorid   = Ifx_Result->cursorid;
+    statemid   = Ifx_Result->statemid;
+    descrpid   = Ifx_Result->descrpid;
+    fieldcount = Ifx_Result->numcols;
+
+    if (array_init(return_value)==FAILURE) {
+        RETURN_FALSE;
+    }
+    num_fields = fieldcount;
+    for (i = 1; i <= num_fields; i++) {
+        EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :fieldname = NAME,
+                                                   :fieldtype = TYPE;
+        if (ifx_check() < 0) {
+            Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+            php3_error(E_WARNING,"Get descriptor (field # %d) fails (%s)",
+                                 i,
+                                 ifx_error(ifx));
+            RETURN_FALSE;
+        }
+            
+        p = fieldname;         /* rtrim fieldname */
+        while ((*p != ' ') && (p < &fieldname[sizeof(fieldname) - 1])) ++p;
+        *p = 0;
+        if (strcmp("(expression)", fieldname) == 0)	/* stored proc */
+            sprintf(fieldname, "[Expr_%d]", i);
+        
+        switch (fieldtype) {
+            case SQLSERIAL  : 
+                char_data = "SQLSERIAL";
+                break;
+            case SQLINT     :
+                char_data = "SQLINT";
+                break;
+            case SQLSMINT   :
+                char_data = "SQLSMINT";
+                break;
+            case SQLDECIMAL :
+                char_data = "SQLDECIMAL";
+                break;
+            case SQLMONEY   :
+                char_data = "SQLMONEY";
+                break;
+            case SQLSMFLOAT :
+                char_data = "SQLSMFLOAT";
+                break;
+            case SQLFLOAT   :
+                char_data = "SQLFLOAT";
+                break;
+            case SQLDATE    :
+                char_data = "SQLDATE";
+                break;
+            case SQLDTIME   :
+                char_data = "SQLDTIME";
+                break;
+            case SQLINTERVAL:
+                char_data = "SQLINTERVAL";
+                break;
+            case SQLCHAR    :
+                char_data = "SQLCHAR";
+                break;
+            case SQLVCHAR   :
+                char_data = "SQLVCHAR";
+                break;
+            case  SQLNCHAR  :   
+                char_data = "SQLNCHAR";
+                break;
+            case  SQLNVCHAR  :   
+                char_data = "SQLNVCHAR";
+                break;
+            case SQLTEXT    :
+                char_data = "SQLTEXT";
+                break;
+            case SQLBYTES   :   
+                char_data = "SQLBYTES";
+                break;
+$ifdef HAVE_IFX_IUS;
+            case  SQLUDTFIXED  :   
+                char_data = "SQLUDTFIXED";
+                break;
+            case  SQLBOOL  :   
+                char_data = "SQLBOOL";
+                break;
+            case  SQLINT8  :   
+                char_data = "SQLINT8";
+                break;
+            case  SQLSERIAL8  :   
+                char_data = "SQLSERIAL8";
+                break;
+            case  SQLLVARCHAR  :   
+                char_data = "SQLLVARCHAR";
+                break;
+$endif;
+            default         :
+               char_data=emalloc(20);
+               sprintf(char_data,"ESQL/C : %i",fieldtype);
+               break;
+        } /* switch (fieldtype) */
+                
+        add_assoc_string(return_value, fieldname, char_data, DUP);
+
+    }   /* for() */ 
+    
+}
+/* }}} */
+
+/* ----------------------------------------------------------------------
+** array ifx_fieldproperties(int $resultid)
+**
+** returns an associative array with fieldnames as key
+** and SQL fieldproperties as data for query $resultid
+**
+** properties are encoded as : "SQLTYPE;length;precision;scale;ISNULLABLE"
+** where SQLTYPE = the Informix type like "SQLVCHAR"  etc...
+**       ISNULLABLE = "Y" or "N"
+** 
+** returns FALSE on error
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto array ifx_fieldproperties(int resultid)
+   returns an associative for query <resultid> array with fieldnames as key */
+void php3_ifx_fieldproperties(INTERNAL_FUNCTION_PARAMETERS)
+{
+    pval *result, *arg2;
+    IFX_RES *Ifx_Result;
+
+EXEC SQL BEGIN DECLARE SECTION;
+    char  *ifx;                 /* connection ID    */
+    char  *cursorid;            /* query cursor id  */
+    char  *statemid;            /* statement id     */
+    char  *descrpid;            /* descriptor id    */
+    char  *statement;           /* query text       */
+    int   fieldcount;           /* field count      */
+    int   i;                    /* an index         */ 
+    char  fieldname[64];        /* fieldname        */
+    short fieldtype;            /* field type       */
+    int   field_ind;            /* the field index  */
+    int   fieldleng;            /* field length     */
+    char  *field;               /* the field        */
+
+    short     indicator;
+    int       int_data;
+    char      *char_data = NULL;
+    long      date_data;
+    interval  intvl_data = {0};
+    datetime  dt_data = {0};
+    decimal   dec_data = {0};
+    short     short_data;
+    float     float_data;
+    double    double_data;
+    loc_t     *locator;
+    int       size;
+    int       precision;
+    int       scale;
+    int       isnullable;
+EXEC SQL END DECLARE SECTION;
+
+    int type;
+    int num_fields;
+    
+    char string_data[256];
+    long long_data;
+    char *p;
+    int  locind;
+    FILE *fp;
+    char *blobfilename;            
+    char *blobdir;
+    char *table_options;
+    int  moredata;
+            
+    Informix_TLS_VARS;
+
+    switch (ARG_COUNT(ht)) {
+        case 1:
+            if (getParameters(ht, 1, &result)==FAILURE) {
+                RETURN_FALSE;
+            }
+            table_options = NULL;
+            break;
+        case 2:
+            if (getParameters(ht, 2, &result, &arg2)==FAILURE) {
+                RETURN_FALSE;
+            }
+            table_options = arg2->value.str.val;
+            break;
+        default:
+            WRONG_PARAM_COUNT;
+            break;
+    }
+    
+    Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+    
+    convert_to_long(result);
+    Ifx_Result = (IFX_RES *) php3_list_find(result->value.lval,&type);
+    
+    if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+        php3_error(E_WARNING,
+                   "%d is not a Informix result index",result->value.lval);
+        RETURN_FALSE;
+    }
+
+    if (strcmp(Ifx_Result->cursorid,"") == 0) {
+        php3_error(E_WARNING,"Not a select cursor !");
+        RETURN_FALSE;
+    }
+
+    ifx        = Ifx_Result->connecid;
+    cursorid   = Ifx_Result->cursorid;
+    statemid   = Ifx_Result->statemid;
+    descrpid   = Ifx_Result->descrpid;
+    fieldcount = Ifx_Result->numcols;
+
+    if (array_init(return_value)==FAILURE) {
+        RETURN_FALSE;
+    }
+    num_fields = fieldcount;
+    for (i = 1; i <= num_fields; i++) {
+        EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :fieldname = NAME,
+                                                   :fieldtype = TYPE,
+                                                   :size = LENGTH,
+                                                   :precision = PRECISION,
+                                                   :scale = SCALE,
+                                                   :isnullable = NULLABLE;
+        if (ifx_check() < 0) {
+            Informix_GLOBAL(php3_ifx_module).sv_sqlcode = SQLCODE;
+            php3_error(E_WARNING,"Get descriptor (field # %d) fails (%s)",
+                                 i,
+                                 ifx_error(ifx));
+            RETURN_FALSE;
+        }
+            
+        p = fieldname;         /* rtrim fieldname */
+        while ((*p != ' ') && (p < &fieldname[sizeof(fieldname) - 1])) ++p;
+        *p = 0;
+        if (strcmp("(expression)", fieldname) == 0)	/* stored proc */
+            sprintf(fieldname, "[Expr_%d]", i);
+
+        switch (fieldtype) {
+            case SQLSERIAL  : 
+                char_data = "SQLSERIAL";
+                break;
+            case SQLINT     :
+                char_data = "SQLINT";
+                break;
+            case SQLSMINT   :
+                char_data = "SQLSMINT";
+                break;
+            case SQLDECIMAL :
+                char_data = "SQLDECIMAL";
+                break;
+            case SQLMONEY   :
+                char_data = "SQLMONEY";
+                break;
+            case SQLSMFLOAT :
+                char_data = "SQLSMFLOAT";
+                break;
+            case SQLFLOAT   :
+                char_data = "SQLFLOAT";
+                break;
+            case SQLDATE    :
+                char_data = "SQLDATE";
+                break;
+            case SQLDTIME   :
+                char_data = "SQLDTIME";
+                break;
+            case SQLINTERVAL:
+                char_data = "SQLINTERVAL";
+                break;
+            case SQLCHAR    :
+                char_data = "SQLCHAR";
+                break;
+            case SQLVCHAR   :
+                char_data = "SQLVCHAR";
+                break;
+            case SQLTEXT    :
+                char_data = "SQLTEXT";
+                break;
+            case SQLBYTES   :   
+                char_data = "SQLBYTES";
+                break;
+            case  SQLNCHAR  :   
+                char_data = "SQLNCHAR";
+                break;
+            case  SQLNVCHAR  :   
+                char_data = "SQLNVCHAR";
+                break;
+$ifdef HAVE_IFX_IUS;
+            case  SQLUDTFIXED  :   
+                char_data = "SQLUDTFIXED";
+                break;
+            case  SQLBOOL  :   
+                char_data = "SQLBOOL";
+                break;
+            case  SQLINT8  :   
+                char_data = "SQLINT8";
+                break;
+            case  SQLSERIAL8  :   
+                char_data = "SQLSERIAL8";
+                break;
+            case  SQLLVARCHAR  :   
+                char_data = "SQLLVARCHAR";
+                break;
+$endif;
+            default         :
+               char_data=emalloc(20);
+               sprintf(char_data,"ESQL/C : %i",fieldtype);
+                break;
+        } /* switch (fieldtype) */
+
+        sprintf(string_data,"%s;%d;%d;%d;%c",
+                            char_data, 
+                            size, 
+                            precision, 
+                            scale,
+                            (isnullable?'Y':'N'));       
+        add_assoc_string(return_value, fieldname, string_data, DUP);
+
+    }   /* for() */ 
+    
+}
+/* }}} */
+
+
+/* --------------------------------------------------------------
+** int ifx_num_rows(int $resultid)
+**
+** returns the number of rows already fetched for query $resultid
+**
+** ---------------------------------------------------------------
+*/
+
+/* {{{ proto int ifx_num_rows(int resultid)
+   returns the number of rows already fetched for query identified by resultid */
+void php3_ifx_num_rows(INTERNAL_FUNCTION_PARAMETERS)
+{
+    pval *result;
+    IFX_RES *Ifx_Result;
+    int type;
+    Informix_TLS_VARS;
+
+    if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) {
+        WRONG_PARAM_COUNT;
+    }
+    
+    Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+    
+    convert_to_long(result);
+    Ifx_Result = (IFX_RES *) php3_list_find(result->value.lval,&type);
+    
+    if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+        php3_error(E_WARNING,"%d is not a Informix result index",
+                   result->value.lval);
+        RETURN_FALSE;
+    }
+    
+    return_value->value.lval = Ifx_Result->rowid;
+    return_value->type = IS_LONG;
+}
+/* }}} */
+
+/* ----------------------------------------------------------------------
+** int ifx_num_fields(int $resultid)
+**
+** returns the number of columns in query $resultid
+** or FALSE on error
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifx_num_fields(int resultid)
+   returns the number of columns in query resultid */
+void php3_ifx_num_fields(INTERNAL_FUNCTION_PARAMETERS)
+{
+    pval *result;
+    IFX_RES *Ifx_Result;
+    int type;
+    Informix_TLS_VARS;
+
+    if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) {
+        WRONG_PARAM_COUNT;
+    }
+    
+    Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+    
+    convert_to_long(result);
+    Ifx_Result = (IFX_RES *) php3_list_find(result->value.lval,&type);
+    
+    if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+        php3_error(E_WARNING,"%d is not a Informix result index",
+                   result->value.lval);
+        RETURN_FALSE;
+    }
+    
+    return_value->value.lval = Ifx_Result->numcols;
+    return_value->type = IS_LONG;
+}
+/* }}} */
+
+
+
+
+/* ----------------------------------------------------------------------
+** int ifx_free_result(int $resultid)
+**
+** releases resources for query associated with $resultid
+**
+** returns FALSE on error
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifx_free_result(int resultid)
+   releases resources for query associated with resultid */
+void php3_ifx_free_result(INTERNAL_FUNCTION_PARAMETERS)
+{
+    pval *result;
+    IFX_RES *Ifx_Result;
+    
+EXEC SQL BEGIN DECLARE SECTION;
+    char *ifx;                 /* connection ID    */
+    char *cursorid;            /* query cursor id  */
+    char *statemid;            /* statement id     */
+    char *descrpid;            /* descriptor id    */
+EXEC SQL END DECLARE SECTION;
+
+    int type;
+
+    int i, locind;
+    
+    Informix_TLS_VARS;
+
+
+    if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &result)==FAILURE) {
+        WRONG_PARAM_COUNT;
+    }
+    
+    convert_to_long(result);
+    if (result->value.lval==0) {
+        RETURN_FALSE;
+    }
+    
+    Ifx_Result = (IFX_RES *) php3_list_find(result->value.lval,&type);
+    
+    if (type!=Informix_GLOBAL(php3_ifx_module).le_result) {
+        php3_error(E_WARNING,"%d is not a Informix result index",
+                   result->value.lval);
+        RETURN_FALSE;
+    }
+    
+    Informix_GLOBAL(php3_ifx_module).sv_sqlcode = 0;
+
+
+    for (i = 0; i < MAX_RESID; ++i) {
+        if (Ifx_Result->res_id[i]>0) {
+         php3_intifx2_free_blob(Ifx_Result->res_id[i],list);
+         Ifx_Result->res_id[i]=-1;
+        }
+    }
+
+    cursorid   = Ifx_Result->cursorid;
+    statemid   = Ifx_Result->statemid;
+    descrpid   = Ifx_Result->descrpid;
+    
+    EXEC SQL free :statemid;
+    if (strlen(cursorid) != 0) {
+        EXEC SQL CLOSE :cursorid;
+        EXEC SQL FREE :cursorid;
+    }
+
+        
+    EXEC SQL DEALLOCATE DESCRIPTOR :descrpid;
+        
+    php3_list_delete(result->value.lval);
+    RETURN_TRUE;
+}
+/* }}} */
+
+
+
+
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * long php3_intifx_getType(long id, HashTable *list)
+ *
+ * returns the type of an id-object
+ *  bid: Id of object
+ *  list: internal hashlist of php3
+ * 
+ * return -1 on error otherwise the type: TYPE_BLTEXT, TYPE_BLBYTE, TYPE_SLOB
+ * ----------------------------------------------------------------------
+*/
+long php3_intifx_getType(long id, HashTable *list) {
+ IFX_IDRES *Ifx_res;
+ int type;
+
+ Ifx_res = (IFX_IDRES *) php3_list_find(id,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult) {
+  php3_error(E_WARNING,"%d is not a Informix id-result index",
+            id);
+  return -1;
+ }
+ return Ifx_res->type;
+ }
+
+
+
+
+/* ----------------------------------------------------------------------
+** int ifx_create_blob(int type, int mode, string param)
+**
+** creates a blob-object
+**  type: 1=TEXT, 0=BYTE
+**  mode: blob-object holds 0=the content in memory, 1=content in file
+**  param: if mode=0: pointer to the content
+**            mode=1: pointer to the filestring
+** return false on error otherwise the new Blob-Object-id
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifx_create_blob(int type, int mode, string param)
+   creates a blob-object */
+void php3_ifx_create_blob(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pmode, *pparam,*ptype;
+ long id;
+ long mode,type;
+  
+ if (ARG_COUNT(ht)!=3 || getParameters(ht, 3, &ptype,&pmode,&pparam)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pmode);
+ convert_to_string(pparam);
+ convert_to_long(ptype);
+
+ type=ptype->value.lval;
+ if(type!=0) 
+  type=TYPE_BLTEXT;
+ mode=pmode->value.lval;
+ if(mode!=0) 
+  mode=BLMODE_INFILE;
+  
+ id=php3_intifx_create_blob(type,mode,pparam->value.str.val,pparam->value.str.len,list); 
+ if(id<0) {
+    RETURN_FALSE;
+ } 
+ RETURN_LONG(id);
+}
+/* }}} */
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * long php3_intifx_create_blob(long type, long mode, char* param, long len, HashTable *list)
+ *
+ * creates an blob-object
+ *  type: 1=TEXT, 0=BYTE
+ *  mode: blob-object holds 0=the content in momory, 1=content in file
+ *  param: if mode=0: pointer to the content
+ *            mode=1: pointer to the filestring
+ *  len: length of param
+ *  list: internal hashlist of php3
+ * return -1 on error otherwise the new Blob-Object-id
+ * ----------------------------------------------------------------------
+*/
+long php3_intifx_create_blob(long type, long mode, char* param, long len, HashTable *list) {
+ IFX_IDRES *Ifx_blob;
+
+
+ Ifx_blob=emalloc(sizeof(IFX_IDRES));
+ if(Ifx_blob==NULL) {
+  php3_error(E_WARNING,"can't create blob-resource");
+  return -1;
+ }
+ 
+ memset(Ifx_blob, 0, sizeof(IFX_IDRES));      
+ 
+ if(type==0 ) {
+  Ifx_blob->type=TYPE_BLBYTE;
+ } else {
+  Ifx_blob->type=TYPE_BLTEXT;
+ }
+ Ifx_blob->BLOB.mode=(int)mode;
+
+ if(mode==BLMODE_INMEM) {
+  if(len>=0) {
+   char *content=emalloc(len);
+   if(content==NULL) {
+    php3_error(E_WARNING,"can't create blob-resource");
+    return -1;
+   }
+   memcpy(content,param,len);
+   Ifx_blob->BLOB.blob_data.loc_loctype=LOCMEMORY;
+   Ifx_blob->BLOB.blob_data.loc_buffer=content;
+   Ifx_blob->BLOB.blob_data.loc_bufsize=len;
+   Ifx_blob->BLOB.blob_data.loc_size=len;
+   Ifx_blob->BLOB.blob_data.loc_mflags=0;
+   Ifx_blob->BLOB.blob_data.loc_oflags=0;
+  } else {
+   Ifx_blob->BLOB.blob_data.loc_loctype=LOCMEMORY;
+   Ifx_blob->BLOB.blob_data.loc_buffer=NULL;
+   Ifx_blob->BLOB.blob_data.loc_bufsize=-1;
+   Ifx_blob->BLOB.blob_data.loc_size=-1;
+   Ifx_blob->BLOB.blob_data.loc_mflags=0;
+   Ifx_blob->BLOB.blob_data.loc_oflags=0;
+  }
+ } else {                             /* mode = BLMODE_INFILE */
+  char *filename=emalloc(len+1);
+  if(filename==NULL)  {
+   php3_error(E_WARNING,"can't create blob-resource");
+   return -1;
+  }
+  memcpy(filename,param,len);
+  filename[len]=0;
+  Ifx_blob->BLOB.blob_data.loc_loctype=LOCFNAME;
+  Ifx_blob->BLOB.blob_data.loc_fname=filename;
+  Ifx_blob->BLOB.blob_data.loc_oflags=LOC_WONLY;
+  Ifx_blob->BLOB.blob_data.loc_size=-1;
+ }
+ return php3_list_insert(Ifx_blob,Informix_GLOBAL(php3_ifx_module).le_idresult);
+}
+
+
+
+
+/* ----------------------------------------------------------------------
+** int ifx_copy_blob(int bid)
+**
+** duplicates the given blob-object
+**  bid: Id of Blobobject
+** 
+** return false on error otherwise the new Blob-Object-id
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifx_copy_blob(int bid)
+   duplicates the given blob-object */
+void php3_ifx_copy_blob(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pbid;
+ long newid;
+  
+ if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &pbid)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pbid);
+
+ newid=php3_intifx_copy_blob(pbid->value.lval,list); 
+ if(newid<0) {
+  RETURN_FALSE;
+ } 
+ 
+ RETURN_LONG(newid);
+}
+/* }}} */
+
+
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * long php3_intifx_copy_blob(long bid, HashTable *list)
+ *
+ * duplicates the given blob-object
+ *  bid: Id of Blobobject
+ *  list: internal hashlist of php3
+ * 
+ * return -1 on error otherwise the new Blob-Object-id
+ * ----------------------------------------------------------------------
+*/
+long php3_intifx_copy_blob(long bid, HashTable *list) {
+ IFX_IDRES *Ifx_blob, *Ifx_blob_orig;
+ loc_t *locator, *locator_orig;
+ int type;
+
+ Ifx_blob_orig = (IFX_IDRES *) php3_list_find(bid,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult || !(Ifx_blob_orig->type==TYPE_BLBYTE || Ifx_blob_orig->type==TYPE_BLTEXT)) {
+  php3_error(E_WARNING,"%d is not a Informix blob-result index",
+            bid);
+  return -1;
+ }
+ Ifx_blob=emalloc(sizeof(IFX_IDRES));
+ if(Ifx_blob==NULL) {
+  php3_error(E_WARNING,"can't create blob-resource");
+  return -1;
+ }
+ 
+ memset(Ifx_blob, 0, sizeof(IFX_IDRES));
+  
+ Ifx_blob->type=Ifx_blob_orig->type;
+ Ifx_blob->BLOB.mode=Ifx_blob_orig->BLOB.mode;
+ 
+ locator=&(Ifx_blob->BLOB.blob_data);
+ locator_orig=&(Ifx_blob_orig->BLOB.blob_data);
+
+ if(Ifx_blob->BLOB.mode==BLMODE_INMEM) {
+  char *content;
+  if(locator_orig->loc_size>=0 && locator_orig->loc_buffer!=NULL) {
+   if((content=emalloc(locator_orig->loc_size))==NULL) {
+    php3_error(E_WARNING,"can't create blob-resource");
+    return -1;
+   }
+   memcpy(content,locator_orig->loc_buffer,  locator_orig->loc_size);
+   locator->loc_buffer=content;
+   locator->loc_bufsize=locator_orig->loc_size;
+   locator->loc_size=locator_orig->loc_size;
+  } else {
+   locator->loc_buffer=NULL;
+   locator->loc_bufsize=-1;
+   locator->loc_size=-1;
+  }
+  locator->loc_loctype=LOCMEMORY;
+  locator->loc_mflags=0;
+  locator->loc_oflags=0;
+ } else {  /* BLMODE_INFILE */
+  char *filename;
+
+  if((filename=emalloc(strlen(locator_orig->loc_fname)+1))==NULL)  {
+   php3_error(E_WARNING,"can't create blob-resource");
+   return -1;
+  }
+  strcpy(filename,locator_orig->loc_fname);
+  locator->loc_loctype=LOCFNAME;
+  locator->loc_fname=filename;
+  locator->loc_size=-1;
+  locator->loc_oflags=locator_orig->loc_oflags;
+ }
+ 
+ return php3_list_insert(Ifx_blob,Informix_GLOBAL(php3_ifx_module).le_idresult);
+}
+
+
+
+/* ----------------------------------------------------------------------
+** int ifx_free_blob(int bid)
+**
+** deletes the blob-object
+**  bid: Id of Blobobject
+** return false on error otherwise true
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifx_free_blob(int bid)
+   deletes the blob-object */
+void php3_ifx_free_blob(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pid;
+ long ret;
+  
+ if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &pid)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pid);
+
+ ret=php3_intifx_free_blob(pid->value.lval,list); 
+ if(ret<0) {
+  RETURN_FALSE;
+ } 
+ RETURN_TRUE;
+}
+/* }}} */
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * long php3_intifx_free_blob(long bid, HashTable *list)
+ *
+ * deletes the blob-object
+ *  bid: Id of Blobobject
+ *  list: internal hashlist of php3
+ * 
+ * return -1 on error otherwise 0
+ * FREES BYTE-MEMORY WITH EFREE()
+ * ----------------------------------------------------------------------
+*/
+long php3_intifx_free_blob(long bid, HashTable *list) {
+ IFX_IDRES *Ifx_blob;
+ int type;
+ 
+ Ifx_blob = (IFX_IDRES *) php3_list_find(bid,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult && !(Ifx_blob->type==TYPE_BLTEXT || Ifx_blob->type==TYPE_BLBYTE)) {
+  php3_error(E_WARNING,"%d is not a Informix blob-result index",
+            bid);
+  return -1;
+ }
+ if(Ifx_blob->BLOB.mode==BLMODE_INMEM) {
+    if(Ifx_blob->BLOB.blob_data.loc_buffer==NULL 
+       || Ifx_blob->BLOB.blob_data.loc_size<=0) {;} else {
+       efree(Ifx_blob->BLOB.blob_data.loc_buffer);  
+    }
+ } else {   /* BLMODE_INFILE */
+    if(Ifx_blob->BLOB.blob_data.loc_fname!=NULL) {
+       efree(Ifx_blob->BLOB.blob_data.loc_fname); 
+    }
+ }
+
+ 
+ php3_list_delete(bid);
+ efree(Ifx_blob); 
+ return 0;
+}
+
+
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * long php3_intifx2_free_blob(long bid, HashTable *list)
+ *
+ * deletes the blob-object
+ *  bid: Id of Blobobject
+ *  list: internal hashlist of php3
+ * 
+ * return -1 on error otherwise 0
+ * FREES BYTE-MEMORY WITH FREE(), for blob memory allocated by ESQL/C  
+ * use this for freeing blob-source after select (in ifx_free_result)
+ * ----------------------------------------------------------------------
+*/
+long php3_intifx2_free_blob(long bid, HashTable *list) {
+ IFX_IDRES *Ifx_blob;
+ int type;
+ 
+ Ifx_blob = (IFX_IDRES *) php3_list_find(bid,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult && !(Ifx_blob->type==TYPE_BLTEXT || Ifx_blob->type==TYPE_BLBYTE)) {
+  php3_error(E_WARNING,"%d is not a Informix blob-result index",
+            bid);
+  return -1;
+ }
+ if(Ifx_blob->BLOB.mode==BLMODE_INMEM) {
+    if(Ifx_blob->BLOB.blob_data.loc_buffer==NULL ||
+       Ifx_blob->BLOB.blob_data.loc_size<=0) {;} else {
+       free(Ifx_blob->BLOB.blob_data.loc_buffer);  
+    }
+ } else {
+    if(Ifx_blob->BLOB.blob_data.loc_fname!=NULL) {
+       efree(Ifx_blob->BLOB.blob_data.loc_fname); 
+    }
+ }
+ 
+ php3_list_delete(bid);
+ efree(Ifx_blob); 
+ return 0;
+}
+
+/* ----------------------------------------------------------------------
+** string ifx_get_blob(int bid)
+**
+** returns the content of the blob-object
+**  bid: Id of Blobobject
+** return the content
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto string ifx_get_blob(int bid)
+   returns the content of the blob-object */
+void php3_ifx_get_blob(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pbid;
+ char *content;
+ long len;
+ 
+  
+ if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &pbid)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pbid);
+
+ len=php3_intifx_get_blob(pbid->value.lval,list,&content); 
+ if(content==NULL || len<0) {
+   RETURN_STRING(php3_intifx_null(),1);
+ }
+ RETURN_STRINGL(content,len,1);
+}
+/* }}} */
+
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * long php3_intifx_get_blob(long bid, HashTable *list, char** content)
+ *
+ * returns the content of the blob-object
+ *  bid: Id of Blobobject
+ *  list: internal hashlist of php3
+ * 
+ * return -1 on error
+ * returns the pointer to the content in char** content and the amount of content in bytes
+ * ----------------------------------------------------------------------
+*/
+long php3_intifx_get_blob(long bid, HashTable *list, char** content) {
+ IFX_IDRES *Ifx_blob;
+ int type;
+ 
+ Ifx_blob = (IFX_IDRES *) php3_list_find(bid,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult && !(Ifx_blob->type==TYPE_BLTEXT || Ifx_blob->type==TYPE_BLBYTE)) {
+  php3_error(E_WARNING,"%d is not a Informix blob-result index",
+            bid);
+  return -1;
+ }
+
+ if(Ifx_blob->BLOB.mode==BLMODE_INMEM) {
+  *content=Ifx_blob->BLOB.blob_data.loc_buffer;
+  return Ifx_blob->BLOB.blob_data.loc_size;
+ }
+ *content=Ifx_blob->BLOB.blob_data.loc_fname;
+ return strlen(Ifx_blob->BLOB.blob_data.loc_fname);
+}
+
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * loc_t *php3_intifx_get_blobloc(long bid, HashTable *list)
+ *
+ * returns the blob-locator-structur
+ *  bid: Id of Blobobject
+ *  list: internal hashlist of php3
+ * return NULL on error or the pointer to the locator-structur
+ * ----------------------------------------------------------------------
+*/
+loc_t *php3_intifx_get_blobloc(long bid, HashTable *list) {
+ IFX_IDRES *Ifx_blob;
+ int type;
+ 
+ Ifx_blob = (IFX_IDRES *) php3_list_find(bid,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult && !(Ifx_blob->type==TYPE_BLTEXT || Ifx_blob->type==TYPE_BLBYTE)) {
+  php3_error(E_WARNING,"%d is not a Informix blob-result index",
+            bid);
+  return NULL;
+ }
+
+ return &(Ifx_blob->BLOB.blob_data);
+}
+
+
+
+/* ----------------------------------------------------------------------
+** int update_blob(int bid, string content)
+**
+** updates the content of the blob-object
+**  bid: Id of Blobobject
+**  content: string of new data
+** return false on error otherwise true
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int update_blob(int bid, string content)
+   updates the content of the blob-object */
+void php3_ifx_update_blob(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pbid,*pparam;
+ long ret;
+ 
+  
+ if (ARG_COUNT(ht)!=2 || getParameters(ht, 2, &pbid,&pparam)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pbid);
+ convert_to_string(pparam);
+ 
+ ret=php3_intifx_update_blob(pbid->value.lval,
+                             pparam->value.str.val,
+                             pparam->value.str.len,
+                             list); 
+ if(ret<0) {
+  RETURN_FALSE;
+ } 
+ RETURN_TRUE;
+}
+/* }}} */
+
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * long php3_intifx_update_blob(long bid, char* param, long len, HashTable *list)
+ *
+ * updates the content of the blob-object
+ *  bid: Id of Blobobject
+ *  param: string of new data
+ *  len: length of string
+ *  list: internal hashlist of php3
+ * return nothing
+ * ----------------------------------------------------------------------
+*/
+long php3_intifx_update_blob(long bid, char* param, long len, HashTable *list) {
+ IFX_IDRES *Ifx_blob;
+ int type;
+ 
+ Ifx_blob = (IFX_IDRES *) php3_list_find(bid,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult && !(Ifx_blob->type==TYPE_BLTEXT || Ifx_blob->type==TYPE_BLBYTE)) {
+  php3_error(E_WARNING,"%d is not a Informix blob-result index",
+            bid);
+  return -1;
+ }
+
+ if(Ifx_blob->BLOB.mode==BLMODE_INMEM) {
+  char *content;
+
+  if(Ifx_blob->BLOB.blob_data.loc_buffer!=NULL)
+   efree(Ifx_blob->BLOB.blob_data.loc_buffer);
+  if(len>=0) {
+   if((content=emalloc(len))==NULL) {
+    php3_error(E_WARNING,"can't create blob-resource");
+    return -1;
+   }
+   memcpy(content,param, len);
+   Ifx_blob->BLOB.blob_data.loc_buffer=content;
+   Ifx_blob->BLOB.blob_data.loc_bufsize=len;
+   Ifx_blob->BLOB.blob_data.loc_size=len;
+  } else {
+   Ifx_blob->BLOB.blob_data.loc_buffer=NULL;
+   Ifx_blob->BLOB.blob_data.loc_bufsize=-1;
+   Ifx_blob->BLOB.blob_data.loc_size=-1;
+  }
+  Ifx_blob->BLOB.blob_data.loc_mflags=0;
+  Ifx_blob->BLOB.blob_data.loc_oflags=0;
+ } else {
+  char *filename;
+
+  if(Ifx_blob->BLOB.blob_data.loc_fname!=NULL)
+   efree(Ifx_blob->BLOB.blob_data.loc_fname);
+  if((filename=emalloc(len+1))==NULL)  {
+   php3_error(E_WARNING,"can't create blob-resource");
+   return -1;
+  }
+  memcpy(filename,param, len);
+  filename[len]=0;
+  Ifx_blob->BLOB.blob_data.loc_fname=filename;
+  Ifx_blob->BLOB.blob_data.loc_size=-1;
+ }
+ return 0;
+}
+
+
+
+/*-------------------------------------------------
+ * internal function
+ *
+ * php3_intifx_create_tmpfile(long bid)
+ * creates a temporary file to store a blob in 
+ *-------------------------------------------------
+*/
+
+
+char* php3_intifx_create_tmpfile(long bid) {
+ char filename[10];
+ char *blobdir;
+ char *blobfile;
+ char *retval;
+  
+ if ((blobdir = getenv("php3_blobdir")) == NULL)
+   blobdir=".";
+ 
+ sprintf(filename,"blb%d",bid);
+ blobfile=tempnam(blobdir,filename);
+ free(blobdir);
+ retval=emalloc(strlen(blobfile)+1);
+ if(retval==NULL) 
+  return NULL;
+ strcpy(retval,blobfile);
+ free(blobfile);
+ return retval;
+}
+
+
+
+
+/* ----------------------------------------------------------------------
+** void ifx_blobinfile_mode(int $mode)
+**
+** sets the default blob-mode for all select-queries 
+**  mode=0: save Byte-Blobs in momory
+**  mode=1: save Byte-Blobs in a file
+** return nothing
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto void ifx_blobinfile_mode(int mode)
+   sets the default blob-mode for all select-queries  */
+void php3_ifx_blobinfile_mode(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pmode;
+
+  
+ if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &pmode)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pmode);
+
+  Informix_GLOBAL(php3_ifx_module).blobinfile=pmode->value.lval;
+  RETURN_TRUE;
+}
+/* }}} */
+
+
+
+/* ----------------------------------------------------------------------
+** void ifx_textasvarchar(int $mode)
+**
+** sets the default text-mode for all select-queries 
+**  mode=0: select returns a blob-id
+**  mode=1: select returns a varchar with text-content
+** return nothing
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto void ifx_textasvarchar(int mode)
+   sets the default text-mode for all select-queries */
+void php3_ifx_textasvarchar(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pmode;
+
+  
+ if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &pmode)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pmode);
+
+  Informix_GLOBAL(php3_ifx_module).textasvarchar=pmode->value.lval;
+  RETURN_TRUE;
+}
+/* }}} */
+
+
+
+/* ----------------------------------------------------------------------
+** void ifx_byteasvarchar(int $mode)
+**
+** sets the default byte-mode for all select-queries 
+**  mode=0: select returns a blob-id
+**  mode=1: select returns a varchar with byte-content
+** return nothing
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto void ifx_byteasvarchar(int mode)
+   sets the default byte-mode for all select-queries  */
+void php3_ifx_byteasvarchar(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pmode;
+  
+ if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &pmode)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pmode);
+
+  Informix_GLOBAL(php3_ifx_module).byteasvarchar=pmode->value.lval;
+  RETURN_TRUE;
+}
+
+
+
+/* ----------------------------------------------------------------------
+** void ifx_nullformat(int $mode)
+**
+** sets the default return value of a NULL-value un a fetch-row 
+**  mode=0: return ""
+**  mode=1: return "NULL"
+** return nothing
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto void ifx_nullformat(int mode)
+   sets the default return value of a NULL-value un a fetch-row  */
+void php3_ifx_nullformat(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pmode;
+
+  
+ if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &pmode)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pmode);
+
+  Informix_GLOBAL(php3_ifx_module).nullformat=pmode->value.lval;
+  RETURN_TRUE;
+}
+/* }}} */
+
+
+/* ----------------------------------------------------------------------
+ * void php3_intifx_null()
+ *
+ * return the NULL-string depending on .nullformat
+ * return "" or "NULL"
+ * ----------------------------------------------------------------------
+*/
+char* php3_intifx_null() {
+  char* tmp;
+
+  if(Informix_GLOBAL(php3_ifx_module).nullformat==0) {
+   tmp=emalloc(1);
+   tmp[0]=0;
+  } else {
+   tmp=emalloc(5);
+   strcpy(tmp,"NULL");
+  }
+  return tmp;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* ----------------------------------------------------------------------
+** int ifx_create_char(string param)
+**
+** creates an char-object
+**  param: content
+** return false on error otherwise the new char-Object-id
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifx_create_char(string param)
+   creates a char-object */
+void php3_ifx_create_char(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pparam;
+ long id;
+  
+ if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &pparam)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_string(pparam);
+
+ id=php3_intifx_create_char(pparam->value.str.val,pparam->value.str.len,list); 
+ if(id<0) {
+    RETURN_FALSE;
+ } 
+ RETURN_LONG(id);
+}
+/* }}} */
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * long php3_intifx_create_char(char* param, long len, HashTable *list)
+ *
+ * creates an char-object
+ *  param: content
+ *  len: length of param
+ *  list: internal hashlist of php3
+ * return -1 on error otherwise the new char-Object-id
+ * ----------------------------------------------------------------------
+*/
+long php3_intifx_create_char(char* param, long len, HashTable *list) {
+ IFX_IDRES *Ifx_char;
+
+
+ Ifx_char=emalloc(sizeof(IFX_IDRES));
+ if(Ifx_char==NULL) {
+  php3_error(E_WARNING,"can't create char-resource");
+  return -1;
+ }
+
+ Ifx_char->type=TYPE_CHAR;
+
+ if(param==NULL || len<0) {
+  Ifx_char->CHAR.char_data=NULL;
+  Ifx_char->CHAR.len=0;
+ } else {
+  Ifx_char->CHAR.char_data=emalloc(len+1);
+  if(Ifx_char->CHAR.char_data==NULL) {
+   efree(Ifx_char);
+   php3_error(E_WARNING,"can't create char-resource");
+   return -1;
+  } 
+  memcpy(Ifx_char->CHAR.char_data,param,len);
+  Ifx_char->CHAR.char_data[len]=0;
+  Ifx_char->CHAR.len=len;
+ }
+ return php3_list_insert(Ifx_char,Informix_GLOBAL(php3_ifx_module).le_idresult);
+}
+
+/* ----------------------------------------------------------------------
+** string ifx_get_char(int bid)
+**
+** returns the content of the char-object
+**  bid: Id of charobject
+** return the content
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto string ifx_get_char(int bid)
+   returns the content of the char-object */
+void php3_ifx_get_char(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pbid;
+ char *content;
+ long len;
+ 
+  
+ if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &pbid)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pbid);
+
+ len=php3_intifx_get_char(pbid->value.lval,list,&content); 
+ if(content==NULL || len<0) {
+   RETURN_STRING("",1);
+ }
+ RETURN_STRINGL(content,len,1);
+}
+/* }}} */
+
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * long php3_intifx_get_char(long bid, HashTable *list, char** content)
+ *
+ * returns the content of the char-object
+ *  bid: Id of charobject
+ *  list: internal hashlist of php3
+ * 
+ * return -1 on error
+ * returns the pointer to the content in char** content and the amount of content in bytes
+ * ----------------------------------------------------------------------
+*/
+long php3_intifx_get_char(long bid, HashTable *list, char** content) {
+ IFX_IDRES *Ifx_char;
+ int type;
+ 
+ Ifx_char = (IFX_IDRES *) php3_list_find(bid,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult && !(Ifx_char->type==TYPE_CHAR)) {
+  php3_error(E_WARNING,"%d is not a Informix char-result index",
+            bid);
+  return -1;
+ }
+
+ *content=Ifx_char->CHAR.char_data;
+ return Ifx_char->CHAR.len;
+}
+
+/* ----------------------------------------------------------------------
+** int ifx_free_char(int bid)
+**
+** deletes the char-object
+**  bid: Id of charobject
+** return false on error otherwise true
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifx_free_char(int bid)
+   deletes the char-object */
+void php3_ifx_free_char(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pid;
+ long ret;
+  
+ if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &pid)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pid);
+
+ ret=php3_intifx_free_char(pid->value.lval,list); 
+ if(ret<0) {
+  RETURN_FALSE;
+ } 
+ RETURN_TRUE;
+}
+/* }}} */
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * long php3_intifx_free_char(long bid, HashTable *list)
+ *
+ * deletes the char-object
+ *  bid: Id of Charobject
+ *  list: internal hashlist of php3
+ * 
+ * return -1 on error otherwise 0
+ * ----------------------------------------------------------------------
+*/
+long php3_intifx_free_char(long bid, HashTable *list) {
+ IFX_IDRES *Ifx_char;
+ int type;
+ 
+ Ifx_char = (IFX_IDRES *) php3_list_find(bid,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult && !(Ifx_char->type==TYPE_CHAR)) {
+  php3_error(E_WARNING,"%d is not a Informix char-result index",
+            bid);
+  return -1;
+ }
+
+ if(Ifx_char->CHAR.char_data!=NULL) {
+  efree(Ifx_char->CHAR.char_data);
+ }
+ 
+ php3_list_delete(bid);
+ efree(Ifx_char); 
+ return 0;
+}
+
+/* ----------------------------------------------------------------------
+** int ifx_update_char(int bid, string content)
+**
+** updates the content of the char-object
+**  bid: Id of charobject
+**  content: string of new data
+** return false on error otherwise true
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifx_update_char(int bid, string content)
+   updates the content of the char-object */
+void php3_ifx_update_char(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pbid,*pparam;
+ long ret;
+ 
+  
+ if (ARG_COUNT(ht)!=2 || getParameters(ht, 2, &pbid,&pparam)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pbid);
+ convert_to_string(pparam);
+ 
+ ret=php3_intifx_update_char(pbid->value.lval,
+                             pparam->value.str.val,
+                             pparam->value.str.len,
+                             list); 
+ if(ret<0) {
+  RETURN_FALSE;
+ } 
+ RETURN_TRUE;
+}
+/* }}} */
+
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * long php3_intifx_update_char(long bid, char* param, long len, HashTable *list)
+ *
+ * updates the content of the char-object
+ *  bid: Id of charobject
+ *  param: string of new data
+ *  len: length of string
+ *  list: internal hashlist of php3
+ * return nothing
+ * ----------------------------------------------------------------------
+*/
+long php3_intifx_update_char(long bid, char* param, long len, HashTable *list) {
+ IFX_IDRES *Ifx_char;
+ int type;
+ 
+ Ifx_char = (IFX_IDRES *) php3_list_find(bid,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult && !(Ifx_char->type==TYPE_CHAR)) {
+  php3_error(E_WARNING,"%d is not a Informix char-result index",
+            bid);
+  return -1;
+ }
+
+ if(Ifx_char->CHAR.char_data!=NULL) {
+  efree(Ifx_char->CHAR.char_data);
+ }
+ Ifx_char->CHAR.char_data=NULL;
+ Ifx_char->CHAR.len=0;
+ 
+ if(param==NULL || len<0) {
+  Ifx_char->CHAR.char_data=NULL;
+  Ifx_char->CHAR.len=0;
+ } else {
+  Ifx_char->CHAR.char_data=emalloc(len+1);
+  if(Ifx_char->CHAR.char_data==NULL) {
+   php3_error(E_WARNING,"can't create char-resource");
+   return -1;
+  } 
+  memcpy(Ifx_char->CHAR.char_data,param,len);
+  Ifx_char->CHAR.char_data[len]=0;
+  Ifx_char->CHAR.len=len;
+ }
+ return 0;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+$ifdef HAVE_IFX_IUS;
+
+
+
+
+/* ----------------------------------------------------------------------
+** int ifxus_create_slob( int mode)
+**
+** creates an slob-object and opens it
+**  mode: 1=LO_RDONLY, 2=LO_WRONLY, 4=LO_APPEND, 8=LO_RDWR, 16=LO_BUFFER, 32=LO_NOBUFFER -> or-mask
+** return false on error otherwise the new Slob-Object-id
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifxus_create_slob(int mode)
+   creates a slob-object and opens it */
+void php3_ifxus_create_slob(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pmode;
+ long id;
+ long mode,create_mode;
+  
+ if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &pmode)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pmode);
+
+ mode=pmode->value.lval;
+ 
+ create_mode=0;
+ if(mode&1!=0)   
+  create_mode|=LO_RDONLY;
+ if(mode&2!=0)   
+  create_mode|=LO_WRONLY;
+ if(mode&4!=0)   
+  create_mode|=LO_APPEND;
+ if(mode&8!=0)   
+  create_mode|=LO_RDWR;
+ if(mode&16!=0)   
+  create_mode|=LO_BUFFER;
+ if(mode&32!=0)   
+  create_mode|=LO_NOBUFFER;
+
+  
+ id=php3_intifxus_create_slob(create_mode,list); 
+ if(id<0) {
+  RETURN_FALSE;
+ } 
+ RETURN_LONG(id);
+}
+/* }}} */
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * long php3_intifx_create_slob(long create_mode, HashTable *list)
+ *
+ * creates an slob-object and opens it
+ *  mode: 1=LO_RDONLY, 2=LO_WRONLY, 4=LO_APPEND, 8=LO_RDWR, 16=LO_BUFFER, 32=LO_NOBUFFER -> or-mask
+ *  list: internal hashlist of php3
+ * return -1 on error otherwise the new Blob-Object-id
+ * ----------------------------------------------------------------------
+*/
+long php3_intifxus_create_slob(long create_mode, HashTable *list) {
+ IFX_IDRES *Ifx_slob;
+ int errcode;
+ 
+
+ Ifx_slob=emalloc(sizeof(IFX_IDRES));
+ if(Ifx_slob==NULL) {
+  php3_error(E_WARNING,"can't create slob-resource");
+  return -1;
+ }
+
+ errcode=ifx_lo_def_create_spec(&(Ifx_slob->SLOB.createspec));     
+ if(errcode<0) {
+  php3_error(E_WARNING,"can't create slob-resource");
+  return -1;
+ }
+
+ Ifx_slob->type=TYPE_SLOB;
+ Ifx_slob->SLOB.lofd=ifx_lo_create(Ifx_slob->SLOB.createspec,create_mode,&(Ifx_slob->SLOB.slob_data),&errcode);     
+ if(errcode<0 || Ifx_slob->SLOB.lofd<0) {
+  php3_error(E_WARNING,"can't create slob-resource");
+  return -1;
+ }
+
+ return php3_list_insert(Ifx_slob,Informix_GLOBAL(php3_ifx_module).le_idresult);
+}
+
+
+
+/* ----------------------------------------------------------------------
+** int ifxus_free_slob(int bid)
+**
+** deletes the slob-object
+**  bid: Id of Slobobject
+** return false on error otherwise true
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifxus_free_slob(int bid)
+   deletes the slob-object */
+void php3_ifxus_free_slob(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pid;
+ long ret;
+  
+ if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &pid)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pid);
+
+ ret=php3_intifxus_close_slob(pid->value.lval,list); 
+ if(ret<0) {
+  RETURN_FALSE;
+ } 
+ RETURN_TRUE;
+}
+/* }}} */
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * long php3_intifxus_free_slob(long bid, HashTable *list)
+ *
+ * deletes the slob-object
+ *  bid: Id of Slobobject
+ *  list: internal hashlist of php3
+ * 
+ * return -1 on error otherwise 0
+ * ----------------------------------------------------------------------
+*/
+long php3_intifxus_free_slob(long bid, HashTable *list) {
+ IFX_IDRES *Ifx_slob;
+ int type;
+ 
+ Ifx_slob = (IFX_IDRES *) php3_list_find(bid,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult || Ifx_slob->type!=TYPE_SLOB) {
+  php3_error(E_WARNING,"%d is not a Informix slob-result index",
+            bid);
+  return -1;
+ }
+
+
+ if(php3_intifxus_close_slob(bid, list)<0) {
+  return -1;
+ }
+ if(Ifx_slob->SLOB.createspec!=NULL) {
+  ifx_lo_spec_free(Ifx_slob->SLOB.createspec);
+  Ifx_slob->SLOB.createspec=NULL;
+ }
+ efree(Ifx_slob);
+ php3_list_delete(bid);
+ return 0;
+}
+
+
+
+
+/* ----------------------------------------------------------------------
+** int ifxus_close_slob(int bid)
+**
+** deletes the slob-object
+**  bid: Id of Slobobject
+** return false on error otherwise true
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifxus_close_slob(int bid)
+   deletes the slob-object */
+void php3_ifxus_close_slob(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pid;
+ long ret;
+  
+ if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &pid)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pid);
+
+ ret=php3_intifxus_close_slob(pid->value.lval,list); 
+ if(ret<0) {
+  RETURN_FALSE;
+ } 
+ RETURN_TRUE;
+}
+/* }}} */
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * long php3_intifxus_close_slob(long bid, HashTable *list)
+ *
+ * deletes the slob-object
+ *  bid: Id of Slobobject
+ *  list: internal hashlist of php3
+ * 
+ * return -1 on error otherwise 0
+ * ----------------------------------------------------------------------
+*/
+long php3_intifxus_close_slob(long bid, HashTable *list) {
+ IFX_IDRES *Ifx_slob;
+ int type;
+ 
+ Ifx_slob = (IFX_IDRES *) php3_list_find(bid,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult || Ifx_slob->type!=TYPE_SLOB) {
+  php3_error(E_WARNING,"%d is not a Informix slob-result index",
+            bid);
+  return -1;
+ }
+
+
+ if(Ifx_slob->SLOB.lofd<0) {
+  php3_error(E_WARNING,"slob-resource already closed");
+  return -1;
+ }
+
+ if(ifx_lo_close(Ifx_slob->SLOB.lofd)<0) {
+  php3_error(E_WARNING,"can't close slob-resource");
+  return -1;
+ }
+
+ Ifx_slob->SLOB.lofd=-1;
+ return 0;
+}
+
+
+
+
+
+/* ----------------------------------------------------------------------
+** int ifxus_open_slob(long bid, int mode)
+**
+** opens an slob-object
+**  bid: existing slob-id
+**  mode: 1=LO_RDONLY, 2=LO_WRONLY, 4=LO_APPEND, 8=LO_RDWR, 16=LO_BUFFER, 32=LO_NOBUFFER -> or-mask
+** return false on error otherwise the new Slob-Object-id
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifxus_open_slob(long bid, int mode)
+   opens an slob-object */
+void php3_ifxus_open_slob(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pbid,*pmode;
+ long id;
+ long mode,create_mode;
+  
+ if (ARG_COUNT(ht)!=2 || getParameters(ht, 1, &pbid,&pmode)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pmode);
+ convert_to_long(pbid);
+ mode=pmode->value.lval;
+ 
+ create_mode=0;
+ if(mode&1!=0)   
+  create_mode|=LO_RDONLY;
+ if(mode&2!=0)   
+  create_mode|=LO_WRONLY;
+ if(mode&4!=0)   
+  create_mode|=LO_APPEND;
+ if(mode&8!=0)   
+  create_mode|=LO_RDWR;
+ if(mode&16!=0)   
+  create_mode|=LO_BUFFER;
+ if(mode&32!=0)   
+  create_mode|=LO_NOBUFFER;
+
+ RETURN_LONG(php3_intifxus_open_slob(pbid->value.lval,create_mode,list));
+}
+/* }}} */
+
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * long php3_intifx_open_slob(long bid,long create_mode, HashTable *list)
+ *
+ * opens an slob-object
+ *  mode: 1=LO_RDONLY, 2=LO_WRONLY, 4=LO_APPEND, 8=LO_RDWR, 16=LO_BUFFER, 32=LO_NOBUFFER -> or-mask
+ *  list: internal hashlist of php3
+ * return -1 on error otherwise the new Blob-Object-id
+ * ----------------------------------------------------------------------
+*/
+long php3_intifxus_open_slob(long bid, long create_mode, HashTable *list) {
+ IFX_IDRES *Ifx_slob;
+ int errcode;
+ int type;
+ 
+
+ Ifx_slob = (IFX_IDRES *) php3_list_find(bid,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult  || Ifx_slob->type!=TYPE_SLOB) {
+  php3_error(E_WARNING,"%d is not a Informix slob-result index",
+            bid);
+  return -1;
+ }
+
+ if(Ifx_slob->SLOB.lofd>0) {
+  php3_error(E_WARNING,"slob-resource already open");
+  return -1;
+ }
+
+ Ifx_slob->SLOB.lofd=ifx_lo_open(&(Ifx_slob->SLOB.slob_data),create_mode,&errcode);     
+ if(errcode<0 || Ifx_slob->SLOB.lofd<0) {
+  php3_error(E_WARNING,"can't open slob-resource");
+  return -1;
+ }
+
+ return 0;
+}
+
+
+
+
+
+
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * long php3_intifxus_new_slob(HashTable *list)
+ *
+ * creates an slob-object but don't open it
+ *  list: internal hashlist of php3
+ * return -1 on error otherwise the new slob-Object-id
+ * ----------------------------------------------------------------------
+*/
+long php3_intifxus_new_slob(HashTable *list) {
+ IFX_IDRES *Ifx_slob;
+ int errcode;
+ 
+
+ Ifx_slob=emalloc(sizeof(IFX_IDRES));
+ if(Ifx_slob==NULL) {
+  php3_error(E_WARNING,"can't create slob-resource");
+  return -1;
+ }
+
+ Ifx_slob->type=TYPE_SLOB;
+ Ifx_slob->SLOB.lofd=-1;
+ Ifx_slob->SLOB.createspec=NULL;
+ return php3_list_insert(Ifx_slob,Informix_GLOBAL(php3_ifx_module).le_idresult);
+}
+
+
+
+/* ----------------------------------------------------------------------
+ * internal function
+ * ifx_lo_t *php3_intifxus_get_slobloc(long bid, HashTable *list)
+ *
+ * retuens the ifx_lo_t-structure of a slob-object
+ *  list: internal hashlist of php3
+ * return -1 on error otherwise the new Blob-Object-id
+ * ----------------------------------------------------------------------
+*/
+ifx_lo_t *php3_intifxus_get_slobloc(long bid, HashTable *list) {
+ IFX_IDRES *Ifx_slob;
+ int errcode, type;
+ 
+ Ifx_slob = (IFX_IDRES *) php3_list_find(bid,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult  || Ifx_slob->type!=TYPE_SLOB) {
+  php3_error(E_WARNING,"%d is not a Informix slob-result index",
+            bid);
+  return NULL;
+ }
+ 
+ return &(Ifx_slob->SLOB.slob_data);
+}
+
+
+
+
+
+
+
+/* ----------------------------------------------------------------------
+** int ifxus_tell_slob(long bid)
+**
+** returns the current file or seek position of an open slob-object
+**  bid: existing slob-id
+** return false on error otherwise the seek-position
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifxus_tell_slob(long bid)
+   returns the current file or seek position of an open slob-object */
+void php3_ifxus_tell_slob(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pbid;
+ long bid;
+ IFX_IDRES *Ifx_slob;
+ ifx_int8_t akt_seek_pos;
+ int type;
+ long lakt_seek_pos;
+ 
+ if (ARG_COUNT(ht)!=1 || getParameters(ht, 1, &pbid)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pbid);
+ bid=pbid->value.lval;
+ Ifx_slob = (IFX_IDRES *) php3_list_find(bid,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult || Ifx_slob->type!=TYPE_SLOB) {
+  php3_error(E_WARNING,"%d is not a Informix slob-result index",
+            bid);
+  RETURN_FALSE;
+ }
+ 
+ if(ifx_lo_tell(Ifx_slob->SLOB.lofd,&akt_seek_pos)<0) {
+  php3_error(E_WARNING,"can't perform tell-operation");
+  RETURN_FALSE;
+ }
+
+ if(ifx_int8tolong(&akt_seek_pos,&lakt_seek_pos)<0) {
+  php3_error(E_WARNING,"seek-position to large for long");
+  RETURN_FALSE;
+ }
+ RETURN_LONG(lakt_seek_pos);
+}
+/* }}} */
+
+
+
+/* ----------------------------------------------------------------------
+** int ifxus_seek_slob(long bid, int mode, long offset)
+**
+** sets the current file or seek position of an open slob-object
+**  bid: existing slob-id
+**  mode: 0=LO_SEEK_SET, 1=LO_SEEK_CUR, 2=LO_SEEK_END
+**  offset: byte-offset
+** return false on error otherwise the seek-position
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifxus_seek_slob(long bid, int mode, long offset)
+   sets the current file or seek position of an open slob-object */
+void php3_ifxus_seek_slob(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pbid, *pmode, *poffset;
+ long bid,lakt_seek_pos;
+ IFX_IDRES *Ifx_slob;
+ ifx_int8_t akt_seek_pos,offset;
+ int type,mode;
+ 
+ if (ARG_COUNT(ht)!=3 || getParameters(ht, 3, &pbid, &pmode, &poffset)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pbid);
+ convert_to_long(pmode); 
+ convert_to_long(poffset);
+ 
+ bid=pbid->value.lval;
+ Ifx_slob = (IFX_IDRES *) php3_list_find(bid,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult || Ifx_slob->type!=TYPE_SLOB) {
+  php3_error(E_WARNING,"%d is not a Informix slob-result index",
+            bid);
+  RETURN_FALSE;
+ }
+
+ mode=LO_SEEK_SET;
+ if(pmode->value.lval==1) {
+  mode=LO_SEEK_CUR;
+ }
+ if(pmode->value.lval==2) {
+  mode=LO_SEEK_END;
+ }
+ 
+ ifx_int8cvlong(poffset->value.lval,&offset);
+ if(ifx_lo_seek(Ifx_slob->SLOB.lofd,&offset, mode,&akt_seek_pos)<0) {
+  php3_error(E_WARNING,"can't perform seek-operation");
+  RETURN_FALSE;
+ }
+
+ if(ifx_int8tolong(&akt_seek_pos,&lakt_seek_pos)<0) {
+  php3_error(E_WARNING,"seek-position to large for long");
+  RETURN_FALSE;
+ }
+ RETURN_LONG(lakt_seek_pos);
+}
+/* }}} */
+
+
+
+
+/* ----------------------------------------------------------------------
+** int ifxus_read_slob(long bid, long nbytes)
+**
+** reads nbytes of the slob-object
+**  bid: existing slob-id
+**  nbytes: bytes zu read
+** return false on error otherwise the string
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifxus_read_slob(long bid, long nbytes)
+   reads nbytes of the slob-object */
+void php3_ifxus_read_slob(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pbid, *pnbytes;
+ long bid, nbytes;
+ IFX_IDRES *Ifx_slob;
+ int errcode,type;
+ char *buffer;
+ 
+
+ if (ARG_COUNT(ht)!=2 || getParameters(ht, 2, &pbid, &pnbytes)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pbid);
+ convert_to_long(pnbytes); 
+ 
+ bid=pbid->value.lval;
+ Ifx_slob = (IFX_IDRES *) php3_list_find(bid,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult || Ifx_slob->type!=TYPE_SLOB) {
+  php3_error(E_WARNING,"%d is not a Informix slob-result index",
+            bid);
+  RETURN_FALSE;
+ }
+
+ nbytes=pnbytes->value.lval;
+ buffer=emalloc (nbytes);
+ if(buffer==NULL) {
+  php3_error(E_WARNING,"cannot allocate memory");
+  RETURN_FALSE;
+ }
+ if(ifx_lo_read(Ifx_slob->SLOB.lofd,buffer,nbytes,&errcode)<0) {
+  efree(buffer);
+  php3_error(E_WARNING,"error during reading slob");
+  RETURN_FALSE;
+ }
+ 
+ RETURN_STRINGL(buffer,nbytes,0); 
+}
+/* }}} */
+
+
+/* ----------------------------------------------------------------------
+** int ifxus_write_slob(long bid, string content)
+**
+** writes a string into the slob-object
+**  bid: existing slob-id
+**  content: content to write
+** return false on error otherwise bytes written
+** ----------------------------------------------------------------------
+*/
+
+/* {{{ proto int ifxus_write_slob(long bid, string content)
+   writes a string into the slob-object */
+void php3_ifxus_write_slob(INTERNAL_FUNCTION_PARAMETERS) {
+ pval *pbid, *pcontent;
+ long bid, nbytes;
+ IFX_IDRES *Ifx_slob;
+ int errcode,type;
+ char *buffer;
+ 
+
+ if (ARG_COUNT(ht)!=2 || getParameters(ht, 2, &pbid, &pcontent)==FAILURE) {
+   WRONG_PARAM_COUNT;
+ }
+ convert_to_long(pbid);
+ convert_to_string(pcontent); 
+ 
+ bid=pbid->value.lval;
+ Ifx_slob = (IFX_IDRES *) php3_list_find(bid,&type);
+ if (type!=Informix_GLOBAL(php3_ifx_module).le_idresult || Ifx_slob->type!=TYPE_SLOB) {
+  php3_error(E_WARNING,"%d is not a Informix slob-result index",
+            bid);
+  RETURN_FALSE;
+ }
+
+ buffer=pcontent->value.str.val;
+ nbytes=pcontent->value.str.len;
+ if(nbytes<=0) {
+  php3_error(E_WARNING,"string has no content");
+  RETURN_FALSE;
+ }
+ if((nbytes=ifx_lo_write(Ifx_slob->SLOB.lofd,buffer,nbytes,&errcode))<0) {
+  php3_error(E_WARNING,"error during writing slob");
+  RETURN_FALSE;
+ }
+ 
+ RETURN_LONG(nbytes); 
+}
+/* }}} */
+
+$endif;
+
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
diff --git a/ext/informix/php3_ifx.h b/ext/informix/php3_ifx.h
new file mode 100644
index 0000000000..d06cf16600
--- /dev/null
+++ b/ext/informix/php3_ifx.h
@@ -0,0 +1,208 @@
+/* 
+   +----------------------------------------------------------------------+
+   | 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: Danny Heijl <Danny.Heijl@cevi.be>, initial cut (ODS 7)      |
+   |          Christian Cartus <chc@idgruppe.de>, blobs, and IUS 9        |
+   |          Jouni Ahto <jah@guru.cultnet.fi>   : configuration stuff    |
+   | based on mysql code by: Zeev Suraski <zeev@zend.com>      |
+   +----------------------------------------------------------------------+
+ */
+
+
+
+#ifndef _PHP3_IFX_H
+#define _PHP3_IFX_H
+
+
+#if COMPILE_DL
+#undef HAVE_IFX
+#define HAVE_IFX 1
+#endif
+
+#if HAVE_IFX
+#ifndef DLEXPORT
+#define DLEXPORT
+#endif
+
+#include "locator.h"
+#include "sqltypes.h"
+
+
+extern php3_module_entry ifx_module_entry;
+#define ifx_module_ptr &ifx_module_entry
+
+extern int php3_minit_ifx(INIT_FUNC_ARGS);
+extern int php3_rinit_ifx(INIT_FUNC_ARGS);
+extern int php3_mshutdown_ifx(SHUTDOWN_FUNC_ARGS);
+extern void php3_info_ifx(void);
+extern void php3_ifx_connect(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_pconnect(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_close(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_query(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_prepare(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_do(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_error(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_errormsg(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_affected_rows(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_num_rows(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_num_fields(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_fetch_row(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_free_result(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_htmltbl_result(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_fieldtypes(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_fieldproperties(INTERNAL_FUNCTION_PARAMETERS);
+
+long php3_intifx_getType(long id, HashTable *list);
+extern void php3_ifx_create_blob(INTERNAL_FUNCTION_PARAMETERS);
+long php3_intifx_create_blob(long type, long mode, char* param, long len, HashTable *list);
+extern void php3_ifx_free_blob(INTERNAL_FUNCTION_PARAMETERS) ;
+long php3_intifx_free_blob(long id, HashTable *list);
+long php3_intifx2_free_blob(long id, HashTable *list);
+extern void php3_ifx_get_blob(INTERNAL_FUNCTION_PARAMETERS);
+long php3_intifx_get_blob(long bid, HashTable *list, char** content);
+extern void php3_ifx_update_blob(INTERNAL_FUNCTION_PARAMETERS);
+long php3_intifx_update_blob(long bid, char* param, long len, HashTable *list);
+loc_t *php3_intifx_get_blobloc(long bid, HashTable *list);
+char* php3_intifx_create_tmpfile(long bid);
+extern void php3_ifx_blobinfile_mode(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_copy_blob(INTERNAL_FUNCTION_PARAMETERS);
+long php3_intifx_copy_blob(long bid, HashTable *list);
+extern void php3_ifx_textasvarchar(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_byteasvarchar(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifx_nullformat(INTERNAL_FUNCTION_PARAMETERS);
+char* php3_intifx_null();
+
+extern void php3_ifx_create_char(INTERNAL_FUNCTION_PARAMETERS);
+long php3_intifx_create_char(char* param, long len, HashTable *list);
+extern void php3_ifx_free_char(INTERNAL_FUNCTION_PARAMETERS) ;
+long php3_intifx_free_char(long id, HashTable *list);
+extern void php3_ifx_update_char(INTERNAL_FUNCTION_PARAMETERS);
+long php3_intifx_update_char(long bid, char* param, long len, HashTable *list);
+extern void php3_ifx_get_char(INTERNAL_FUNCTION_PARAMETERS);
+long php3_intifx_get_char(long bid, HashTable *list, char** content);
+
+
+#if HAVE_IFX_IUS
+extern void php3_ifxus_create_slob(INTERNAL_FUNCTION_PARAMETERS);
+long php3_intifxus_create_slob(long create_mode, HashTable *list);
+extern void php3_ifxus_free_slob(INTERNAL_FUNCTION_PARAMETERS) ;
+long php3_intifxus_free_slob(long bid, HashTable *list);
+extern void php3_ifxus_close_slob(INTERNAL_FUNCTION_PARAMETERS) ;
+long php3_intifxus_close_slob(long bid, HashTable *list);
+extern void php3_ifxus_open_slob(INTERNAL_FUNCTION_PARAMETERS) ;
+long php3_intifxus_open_slob(long bid, long create_mode, HashTable *list);
+long php3_intifxus_new_slob(HashTable *list);
+ifx_lo_t *php3_intifxus_get_slobloc(long bid, HashTable *list);
+extern void php3_ifxus_read_slob(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifxus_write_slob(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifxus_seek_slob(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ifxus_tell_slob(INTERNAL_FUNCTION_PARAMETERS);
+#endif
+
+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,le_idresult;
+	char *default_host, *default_user, *default_password;
+	int connectionid;
+	int cursorid;
+        int sv_sqlcode;      /* saved informix SQLCODE value */
+        long blobinfile;     /* 0=save in memory, 1=save in file */
+        long textasvarchar;  /* 0=as id, 1=as varchar */
+        long byteasvarchar;  /* 0=as id, 1=as varchar */
+        long charasvarchar;  /* 0=don't strip trailing blanks, 1=strip */
+        long nullformat;     /* 0=NULL as "", 1= NULL as "NULL" */
+} ifx_module;
+
+#define MAX_RESID          64
+#define BLOBINFILE 0      /* 0=in memory, 1=in file */
+
+typedef struct ifx_res {
+	char connecid[16];
+	char cursorid[16];
+	char descrpid[16];
+	char statemid[16];
+        int  isscroll;
+        int  ishold;
+        int  iscursory;
+        int  paramquery;
+	int  numcols;
+	int  rowid;
+        int  affected_rows;
+        int res_id[MAX_RESID];
+} IFX_RES;
+
+
+
+
+
+typedef struct _IFX_IDRES {
+ 	  int type;
+          union {
+           struct {
+  	    int mode;
+	    loc_t blob_data;
+	   } BLOBRES;
+	   struct {
+	     char *char_data;
+	     int len;
+ 	   } CHARRES;
+#if HAVE_IFX_IUS
+	   struct {
+            ifx_lo_t slob_data;
+            ifx_lo_create_spec_t *createspec;
+            int lofd;
+ 	   } SLOBRES;
+#endif
+	  } DATARES;
+} IFX_IDRES;
+
+
+
+#define BLOB DATARES.BLOBRES
+#define CHAR DATARES.CHARRES
+
+#if HAVE_IFX_IUS
+#define SLOB DATARES.SLOBRES
+#endif
+
+
+
+
+
+
+#ifndef THREAD_SAFE
+extern ifx_module php3_ifx_module;
+#endif
+
+#else
+
+#define ifx_module_ptr NULL
+
+#endif
+
+#endif /* _PHP3_IFX_H */
diff --git a/ext/informix/setup.stub b/ext/informix/setup.stub
new file mode 100644
index 0000000000..a7476fb79e
--- /dev/null
+++ b/ext/informix/setup.stub
@@ -0,0 +1,6 @@
+# $Source$
+# $Id$
+
+define_option with-informix 'informix support?' yesnodir no \
+'    Whether to build the informix extension.'
+	
diff --git a/ext/odbc/odbc.c b/ext/odbc/odbc.c
index 254feb9f48..23c1a39ae1 100644
--- a/ext/odbc/odbc.c
+++ b/ext/odbc/odbc.c
@@ -50,7 +50,7 @@
 # include "dl/phpdl.h"
 # include "ext/standard/php3_standard.h"
 # include "php3_odbc.h"
-# include "functions/head.h"
+# include "ext/standard/head.h"
 # include "snprintf.h"
 # include "php_ini.h"
 
diff --git a/ext/standard/Makefile.am b/ext/standard/Makefile.am
index 5de911d484..7f6ed0f0b5 100644
--- a/ext/standard/Makefile.am
+++ b/ext/standard/Makefile.am
@@ -7,5 +7,5 @@ libphpext_standard_a_SOURCES=\
 	html.c image.c info.c link.c mail.c math.c md5.c microtime.c \
 	pack.c pageinfo.c rand.c reg.c soundex.c string.c \
 	syslog.c type.c uniqid.c url.c iptc.c var.c quot_print.c \
-	cyr_convert.c flock_compat.c
+	cyr_convert.c flock_compat.c crypt.c dl.c head.c
 
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
new file mode 100644
index 0000000000..c57a64fd00
--- /dev/null
+++ b/ext/standard/crypt.c
@@ -0,0 +1,197 @@
+/*
+   +----------------------------------------------------------------------+
+   | 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: Stig Bakken <ssb@gaurdian.no>                               |
+   |          Zeev Suraski <zeev@php.net>                                 |
+   |          Rasmus Lerdorf <rasmus@lerdorf.on.ca>                       |
+   +----------------------------------------------------------------------+
+ */
+/* $Id$ */
+#include <stdlib.h>
+
+#include "php.h"
+
+#if HAVE_CRYPT
+
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if HAVE_CRYPT_H
+#include <crypt.h>
+#endif
+#if TM_IN_SYS_TIME
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#if HAVE_STRING_H
+#include <string.h>
+#else
+#include <strings.h>
+#endif
+
+#if MSVC5
+#include <process.h>
+extern char *crypt(char *__key,char *__salt);
+#endif
+
+#include "php3_crypt.h"
+
+function_entry crypt_functions[] = {
+	{"crypt",	php3_crypt,		NULL},
+	{NULL, NULL, NULL}
+};
+
+php3_module_entry crypt_module_entry = {
+	"Crypt", crypt_functions, php_minit_crypt, NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES
+};
+
+
+/* 
+   The capabilities of the crypt() function is determined by the test programs
+   run by configure from aclocal.m4.  They will set PHP3_STD_DES_CRYPT,
+   PHP3_EXT_DES_CRYPT, PHP3_MD5_CRYPT and PHP3_BLOWFISH_CRYPT as appropriate 
+   for the target platform
+*/
+#ifdef PHP3_STD_DES_CRYPT
+#define PHP3_MAX_SALT_LEN 2
+#endif
+#ifdef PHP3_EXT_DES_CRYPT
+#undef PHP3_MAX_SALT_LEN
+#define PHP3_MAX_SALT_LEN 9
+#endif
+#ifdef PHP3_MD5_CRYPT
+#undef PHP3_MAX_SALT_LEN
+#define PHP3_MAX_SALT_LEN 12
+#endif
+#ifdef PHP3_BLOWFISH_CRYPT
+#undef PHP3_MAX_SALT_LEN
+#define PHP3_MAX_SALT_LEN 17
+#endif
+
+#ifdef HAVE_LRAND48
+#define PHP3_CRYPT_RAND lrand48()
+#else
+#ifdef HAVE_RANDOM
+#define PHP3_CRYPT_RAND random()
+#else
+#define PHP3_CRYPT_RAND rand()
+#endif
+#endif
+
+int php_minit_crypt(INIT_FUNC_ARGS)
+{
+	ELS_FETCH();
+
+#ifdef PHP3_STD_DES_CRYPT
+    REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", 2, CONST_CS | CONST_PERSISTENT);
+#else
+#if PHP3_MD5_CRYPT
+    REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", 12, CONST_CS | CONST_PERSISTENT);
+#endif
+#endif
+    REGISTER_LONG_CONSTANT("CRYPT_STD_DES", PHP3_STD_DES_CRYPT, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("CRYPT_EXT_DES", PHP3_EXT_DES_CRYPT, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("CRYPT_MD5", PHP3_MD5_CRYPT, CONST_CS | CONST_PERSISTENT);
+    REGISTER_LONG_CONSTANT("CRYPT_BLOWFISH", PHP3_BLOWFISH_CRYPT, CONST_CS | CONST_PERSISTENT);
+    return SUCCESS;
+}
+
+static unsigned char itoa64[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+static void php3i_to64(char *s, long v, int n)	{
+	while (--n >= 0) {
+		*s++ = itoa64[v&0x3f]; 		
+		v >>= 6;
+	} 
+} 
+
+void php3_crypt(INTERNAL_FUNCTION_PARAMETERS)
+{
+	char salt[PHP3_MAX_SALT_LEN];
+	pval *arg1, *arg2;
+
+	salt[0]='\0';
+
+	switch (ARG_COUNT(ht)) {
+		case 1:
+			if (getParameters(ht, 1, &arg1)==FAILURE) {
+				RETURN_FALSE;
+			}
+			break;
+		case 2:
+			if (getParameters(ht, 2, &arg1, &arg2)==FAILURE) {
+				RETURN_FALSE;
+			}
+			convert_to_string(arg2);
+			memcpy(salt, arg2->value.str.val, MIN(PHP3_MAX_SALT_LEN,arg2->value.str.len));
+			break;
+		default:
+			WRONG_PARAM_COUNT;
+			break;
+	}
+	convert_to_string(arg1);
+
+	/* The automatic salt generation only covers standard DES and md5-crypt */
+	if(!*salt) {
+#ifdef HAVE_SRAND48
+		srand48((unsigned int) time(0) * getpid());
+#else
+#ifdef HAVE_SRANDOM
+		srandom((unsigned int) time(0) * getpid());
+#else
+		srand((unsigned int) time(0) * getpid());
+#endif
+#endif
+
+#ifdef PHP3_STD_DES_CRYPT
+		php3i_to64(&salt[0], PHP3_CRYPT_RAND, 2);
+		salt[2] = '\0';
+#else
+#if PHP3_MD5_CRYPT
+		strcpy(salt, "$1$");
+		to64(&salt[3], PHP3_CRYPT_RAND, 4);
+		to64(&salt[7], PHP3_CRYPT_RAND, 4);
+		strcpy(&salt[11], "$");
+#endif
+#endif
+	}
+
+	return_value->value.str.val = (char *) crypt(arg1->value.str.val, salt);
+	return_value->value.str.len = strlen(return_value->value.str.val);
+	return_value->type = IS_STRING;
+	pval_copy_constructor(return_value);
+}
+
+#endif
+
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
diff --git a/ext/standard/dl.c b/ext/standard/dl.c
new file mode 100644
index 0000000000..e10ba466c1
--- /dev/null
+++ b/ext/standard/dl.c
@@ -0,0 +1,185 @@
+/*
+   +----------------------------------------------------------------------+
+   | 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: Brian Schaffner <brian@tool.net>                            |
+   |          Shane Caraveo <shane@caraveo.com>                           |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+ */
+
+#ifdef THREAD_SAFE
+#include "tls.h"
+#endif
+#include "php.h"
+#include "dl.h"
+#include "php_globals.h"
+
+#if HAVE_LIBDL
+#include <stdlib.h>
+#include <stdio.h>
+#ifndef RTLD_LAZY
+# define RTLD_LAZY 1    /* Solaris 1, FreeBSD's (2.1.7.1 and older) */
+#endif
+#if HAVE_STRING_H
+#include <string.h>
+#else
+#include <strings.h>
+#endif
+#if MSVC5
+#include "win32/param.h"
+#include "win32/winutil.h"
+#else
+#include <sys/param.h>
+#endif
+
+function_entry dl_functions[] = {
+	{"dl",		dl,		NULL},
+	{NULL, NULL, NULL}
+};
+
+
+php3_module_entry dl_module_entry = {
+	"PHP_DL", dl_functions, NULL, NULL, NULL, NULL, php3_info_dl, STANDARD_MODULE_PROPERTIES
+};
+
+#endif
+
+/* {{{ proto int dl(string extension_filename)
+   Load a PHP extension at runtime */
+void dl(INTERNAL_FUNCTION_PARAMETERS)
+{
+	pval *file;
+	PLS_FETCH();
+
+	/* obtain arguments */
+	if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &file) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+
+	convert_to_string(file);
+
+	if (!PG(enable_dl)) {
+		php3_error(E_ERROR, "Dynamically loaded extentions aren't enabled.");
+	} else if (PG(safe_mode)) {
+		php3_error(E_ERROR, "Dynamically loaded extensions aren't allowed when running in SAFE MODE.");
+	} else {
+		php3_dl(file,MODULE_TEMPORARY,return_value);
+	}
+}
+/* }}} */
+
+
+#if HAVE_LIBDL
+
+void php3_dl(pval *file,int type,pval *return_value)
+{
+	void *handle;
+	char libpath[MAXPATHLEN + 1];
+	php3_module_entry *module_entry,*tmp;
+	php3_module_entry *(*get_module)(void);
+	PLS_FETCH();
+	
+	if (cfg_get_string("extension_dir",&PG(extension_dir))==SUCCESS && PG(extension_dir)){
+		int extension_dir_len = strlen(PG(extension_dir));
+
+		if (PG(extension_dir)[extension_dir_len-1]=='/' || PG(extension_dir)[extension_dir_len-1]=='\\') {
+			sprintf(libpath,"%s%s",PG(extension_dir),file->value.str.val);  /* SAFE */
+		} else {
+			sprintf(libpath,"%s/%s",PG(extension_dir),file->value.str.val);  /* SAFE */
+		}
+	} else {
+		sprintf(libpath,"%s",file->value.str.val);  /* SAFE */
+	}
+
+	/* load dynamic symbol */
+	handle = dlopen(libpath, RTLD_LAZY);
+	if (!handle) {
+#if MSVC5
+		php3_error(E_ERROR,"Unable to load dynamic library '%s'<br>\n%s",libpath,php3_win_err());
+#else
+		php3_error(E_ERROR,"Unable to load dynamic library '%s' - %s",libpath,dlerror());
+#endif
+		RETURN_FALSE;
+	}
+	get_module = (php3_module_entry *(*)(void)) dlsym(handle, "get_module");
+	
+	if (!get_module) {
+		dlclose(handle);
+		php3_error(E_CORE_WARNING,"Invalid library (maybe not a PHP3 library) '%s' ",file->value.str.val);
+		RETURN_FALSE;
+	}
+	module_entry = get_module();
+	module_entry->type = type;
+	module_entry->module_number = zend_next_free_module();
+	if (module_entry->module_startup_func) {
+		if (module_entry->module_startup_func(type, module_entry->module_number)==FAILURE) {
+			php3_error(E_CORE_WARNING,"%s:  Unable to initialize module",module_entry->name);
+			dlclose(handle);
+			RETURN_FALSE;
+		}
+	}
+	zend_register_module(module_entry);
+
+
+	if (module_entry->request_startup_func) {
+		if (module_entry->request_startup_func(type, module_entry->module_number)) {
+			php3_error(E_CORE_WARNING,"%s:  Unable to initialize module",module_entry->name);
+			dlclose(handle);
+			RETURN_FALSE;
+		}
+	}
+	
+	/* update the .request_started property... */
+	if (_php3_hash_find(&GLOBAL(module_registry),module_entry->name,strlen(module_entry->name)+1,(void **) &tmp)==FAILURE) {
+		php3_error(E_ERROR,"%s:  Loaded module got lost",module_entry->name);
+		RETURN_FALSE;
+	}
+	tmp->request_started=1;
+	tmp->handle = handle;
+	
+	RETURN_TRUE;
+}
+
+void php3_info_dl(void){
+	TLS_VARS;
+	PUTS("Dynamic Library support enabled.\n");
+}
+
+#else
+
+void php3_dl(pval *file,int type,pval *return_value)
+{
+	php3_error(E_WARNING,"Cannot dynamically load %s - dynamic modules are not supported",file->value.str.val);
+	RETURN_FALSE;
+}
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
diff --git a/ext/standard/dl.h b/ext/standard/dl.h
new file mode 100644
index 0000000000..900bca4294
--- /dev/null
+++ b/ext/standard/dl.h
@@ -0,0 +1,60 @@
+/* 
+   +----------------------------------------------------------------------+
+   | 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: Brian Schaffner <brian@tool.net>                            |
+   |          Shane Caraveo <shane@caraveo.com>                           |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+ */
+
+
+/* $Id$ */
+
+#ifndef _DL_H
+#define _DL_H
+
+extern void php3_dl(pval *file,int type,pval *return_value);
+
+
+#if HAVE_LIBDL
+
+extern php3_module_entry dl_module_entry;
+#define dl_module_ptr &dl_module_entry
+
+/* dynamic loading functions */
+extern void dl(INTERNAL_FUNCTION_PARAMETERS);
+extern int php3_minit_dl(INIT_FUNC_ARGS);
+extern int php3_mshutdown_dl(SHUTDOWN_FUNC_ARGS);
+extern int php3_rshutdown_dl(SHUTDOWN_FUNC_ARGS);
+extern void php3_info_dl(void);
+
+#else
+
+#define dl_module_ptr NULL
+
+#endif
+
+
+#endif /* _DL_H */
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index 3ca66b3c9b..af35ae131e 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -36,7 +36,7 @@
 #include <ctype.h>
 #include "php3_string.h"
 #include "safe_mode.h"
-#include "functions/head.h"
+#include "ext/standard/head.h"
 #include "exec.h"
 #include "php_globals.h"
 
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 8886db2669..86e499e28f 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -51,7 +51,7 @@
 #include <sys/socket.h>
 /* #include <sys/uio.h> */
 #endif
-#include "functions/head.h"
+#include "ext/standard/head.h"
 #include "safe_mode.h"
 #include "php3_string.h"
 #include "file.h"
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index 03e23b9526..956f0071fd 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -34,7 +34,7 @@
 #include "tls.h"
 #endif
 #include "php.h"
-#include "functions/head.h"
+#include "ext/standard/head.h"
 #include "php3_string.h"
 #include "zend_execute.h"
 #include <stdio.h>
diff --git a/ext/standard/head.c b/ext/standard/head.c
new file mode 100644
index 0000000000..70429bee34
--- /dev/null
+++ b/ext/standard/head.c
@@ -0,0 +1,574 @@
+/*
+   +----------------------------------------------------------------------+
+   | 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: Rasmus Lerdorf <rasmus@lerdorf.on.ca>                       |
+   +----------------------------------------------------------------------+
+ */
+/* $Id$ */
+#ifdef THREAD_SAFE
+#include "tls.h"
+#endif
+#include <stdio.h>
+#include "php.h"
+#include "ext/standard/php3_standard.h"
+#include "main.h"
+#include "head.h"
+#include "post.h"
+#ifdef TM_IN_SYS_TIME
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+
+#include "php_globals.h"
+#include "safe_mode.h"
+
+
+/* need to figure out some nice way to get rid of these */
+#ifndef THREAD_SAFE
+static int php3_HeaderPrinted = 0;
+static int php3_PrintHeader = 1;
+static CookieList *top = NULL;
+static char *cont_type = NULL;
+static int header_called = 0;
+#endif
+
+void php3_PushCookieList(char *, char *, time_t, char *, char *, int);
+CookieList *php3_PopCookieList(void);
+
+int php3_init_head(INIT_FUNC_ARGS)
+{
+	TLS_VARS;
+	GLOBAL(php3_HeaderPrinted) = 0;
+	if (GLOBAL(header_called) == 0)
+		GLOBAL(php3_PrintHeader) = 1;
+	GLOBAL(top) = NULL;
+	GLOBAL(cont_type) = NULL;
+
+	return SUCCESS;
+}
+
+void php3_noheader(void)
+{
+	TLS_VARS;
+	GLOBAL(php3_PrintHeader) = 0;
+	GLOBAL(header_called) = 1;
+}
+
+
+/* Adds header information */
+void php4i_add_header_information(char *header_information)
+{
+	char *r;
+#if APACHE
+	char *rr = NULL;
+	char *temp = NULL;
+	long myuid = 0L;
+	char temp2[32];
+#endif
+
+	if (GLOBAL(php3_HeaderPrinted) == 1) {
+#if DEBUG
+		php3_error(E_WARNING, "Cannot add more header information - the header was already sent "
+							  "(header information may be added only before any output is generated from the script - "
+							  "check for text or whitespace outside PHP tags, or calls to functions that output text)");
+#endif
+		return;					/* too late, already sent */
+	}
+#if APACHE
+	/*
+	 * Not entirely sure this is the right way to support the header
+	 * command in the Apache module.  Comments?
+	 */
+	r = strchr(header_information, ':');
+	if (r) {
+		*r = '\0';
+		if (!strcasecmp(header_information, "Content-type")) {
+			if (*(r + 1) == ' ')
+				GLOBAL(php3_rqst)->content_type = pstrdup(GLOBAL(php3_rqst)->pool,r + 2);
+			else
+				GLOBAL(php3_rqst)->content_type = pstrdup(GLOBAL(php3_rqst)->pool,r + 1);
+			GLOBAL(cont_type) = (char *)GLOBAL(php3_rqst)->content_type;
+		} else {
+			if (*(r + 1) == ' ') {
+				rr = r + 2;
+			} else {
+				rr = r + 1;
+			}
+			if (PG(safe_mode) && (!strcasecmp(header_information, "WWW-authenticate"))) {
+				myuid = _php3_getuid();
+				sprintf(temp2, "realm=\"%ld ", myuid);  /* SAFE */
+				temp = _php3_regreplace("realm=\"", temp2, rr, 1, 0);
+				if (!strcmp(temp, rr)) {
+					sprintf(temp2, "realm=%ld", myuid);  /* SAFE */
+					temp = _php3_regreplace("realm=", temp2, rr, 1, 0);
+					if (!strcmp(temp, rr)) {
+						sprintf(temp2, " realm=%ld", myuid);  /* SAFE */
+						temp = _php3_regreplace("$", temp2, rr, 0, 0);
+					}
+				}
+				table_set(GLOBAL(php3_rqst)->headers_out, header_information, temp);
+			} else
+				table_set(GLOBAL(php3_rqst)->headers_out, header_information, rr);
+		}
+		if (!strcasecmp(header_information, "location")) {
+			GLOBAL(php3_rqst)->status = REDIRECT;
+		}
+		*r = ':';
+		GLOBAL(php3_HeaderPrinted) = 2;
+	}
+	if (!strncasecmp(header_information, "http/", 5)) {
+		if (strlen(header_information) > 9) {
+			GLOBAL(php3_rqst)->status = atoi(&((header_information)[9]));
+		}
+		/* Use a pstrdup here to get the memory straight from Apache's per-request pool to
+		 * avoid having our own memory manager complain about this memory not being freed
+		 * because it really shouldn't be freed until the end of the request and it isn't
+		 * easy for us to figure out when we allocated it vs. when something else might have.
+		 */
+		GLOBAL(php3_rqst)->status_line = pstrdup(GLOBAL(php3_rqst)->pool,&((header_information)[9]));
+	}
+#else
+	r = strchr(header_information, ':');
+	if (r) {
+		*r = '\0';
+		if (!strcasecmp(header_information, "Content-type")) {
+			if (GLOBAL(cont_type)) efree(GLOBAL(cont_type));
+			GLOBAL(cont_type) = estrdup(r + 1);
+#if 0 /*WIN32|WINNT / *M$ does us again*/
+			if (!strcmp(GLOBAL(cont_type)," text/html")){
+				*r=':';
+				PUTS_H(header_information);
+				PUTS_H("\015\012");
+			}
+#endif
+		} else {
+			*r = ':';
+#if USE_SAPI
+			{
+				char *tempstr=emalloc(strlen(header_information)+2);
+				
+				sprintf(tempstr,"%s\015\012",tempstr);
+				GLOBAL(sapi_rqst)->header(GLOBAL(sapi_rqst)->scid,tempstr);
+				efree(tempstr);
+			}
+#elif FHTTPD
+            php3_fhttpd_puts_header(header_information);
+            php3_fhttpd_puts_header("\r\n");
+#else
+			PUTS_H(header_information);
+			PUTS_H("\015\012");
+#endif
+		}
+	} else {
+#if USE_SAPI
+		{
+		char *tempstr=emalloc(strlen(header_information)+2);
+		sprintf(tempstr,"%s\015\012",tempstr);
+		GLOBAL(sapi_rqst)->header(GLOBAL(sapi_rqst)->scid,tempstr);
+		efree(tempstr);
+		}
+#elif FHTTPD
+        php3_fhttpd_puts_header(header_information);
+        php3_fhttpd_puts_header("\r\n");
+#else
+		PUTS_H(header_information);
+		PUTS_H("\015\012");
+#endif
+	}
+#endif
+}
+
+
+/* Implementation of the language Header() function */
+void php3_Header(INTERNAL_FUNCTION_PARAMETERS)
+{
+	pval *arg1;
+
+	if (getParameters(ht, 1, &arg1) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+	convert_to_string(arg1);
+	php4i_add_header_information(arg1->value.str.val);
+}
+
+
+
+
+/*
+ * php3_header() flushes the header info built up using calls to
+ * the Header() function.  If type is 1, a redirect to str is done.
+ * Otherwise type should be 0 and str NULL.
+ *
+ * The function returns non-zero if output is allowed after the
+ * call, and zero otherwise.  Any call to php3_header() must check
+ * the return status and if false, no output must be sent.  This
+ * is in order to correctly handle HEAD requests.
+ */
+PHPAPI int php3_header(void)
+{
+#if APACHE
+	CookieList *cookie;
+	int len = 0;
+	time_t t;
+      char *dt, *cookievalue = NULL;
+#endif
+#if APACHE || defined(USE_SAPI) || FHTTPD
+	char *tempstr;
+#endif
+TLS_VARS;
+
+	if (GLOBAL(header_is_being_sent)) {
+		return 0;
+	} else {
+		GLOBAL(header_is_being_sent) = 1;
+	}
+
+#if APACHE
+	if (!GLOBAL(php3_rqst)) {  /* we're not in a request, allow output */
+		GLOBAL(header_is_being_sent) = 0;
+		return 1;
+	}
+	if ((GLOBAL(php3_PrintHeader) && !GLOBAL(php3_HeaderPrinted)) || (GLOBAL(php3_PrintHeader) && GLOBAL(php3_HeaderPrinted) == 2)) {
+		if (!(GLOBAL(initialized) & INIT_ENVIRONMENT) && GLOBAL(request_info).request_method && !strcasecmp(GLOBAL(request_info).request_method, "post")) {
+			php3_treat_data(PARSE_POST, NULL);	/* POST Data */
+		}
+		cookie = php3_PopCookieList();
+		while (cookie) {
+			if (cookie->name)
+				len += strlen(cookie->name);
+                      if (cookie->value) {
+                              cookievalue = _php3_urlencode(cookie->value, strlen (cookie->value));
+                              len += strlen(cookievalue);
+                      }
+			if (cookie->path)
+				len += strlen(cookie->path);
+			if (cookie->domain)
+				len += strlen(cookie->domain);
+			tempstr = emalloc(len + 100);
+			if (!cookie->value || (cookie->value && !*cookie->value)) {
+				/* 
+				 * MSIE doesn't delete a cookie when you set it to a null value
+				 * so in order to force cookies to be deleted, even on MSIE, we
+				 * pick an expiry date 1 year and 1 second in the past
+				 */
+				sprintf(tempstr, "%s=deleted", cookie->name);
+				t = time(NULL) - 31536001;
+				strcat(tempstr, "; expires=");
+				dt = php3_std_date(t);
+				strcat(tempstr, dt);
+				efree(dt);
+			} else {
+				/* FIXME: XXX: this is not binary data safe */
+                              sprintf(tempstr, "%s=%s", cookie->name, cookie->value ? cookievalue : "");
+				if (cookie->name) efree(cookie->name);
+				if (cookie->value) efree(cookie->value);
+                              if (cookievalue) efree(cookievalue);
+				cookie->name=NULL;
+				cookie->value=NULL;
+                              cookievalue=NULL;
+				if (cookie->expires > 0) {
+					strcat(tempstr, "; expires=");
+					dt = php3_std_date(cookie->expires);
+					strcat(tempstr, dt);
+					efree(dt);
+				}
+			}
+			if (cookie->path && strlen(cookie->path)) {
+				strcat(tempstr, "; path=");
+				strcat(tempstr, cookie->path);
+				efree(cookie->path);
+				cookie->path=NULL;
+			}
+			if (cookie->domain && strlen(cookie->domain)) {
+				strcat(tempstr, "; domain=");
+				strcat(tempstr, cookie->domain);
+				efree(cookie->domain);
+				cookie->domain=NULL;
+			}
+			if (cookie->secure) {
+				strcat(tempstr, "; secure");
+			}
+			table_add(GLOBAL(php3_rqst)->headers_out, "Set-Cookie", tempstr);
+			if (cookie->domain) efree(cookie->domain);
+			if (cookie->path) efree(cookie->path);
+			if (cookie->name) efree(cookie->name);
+			if (cookie->value) efree(cookie->value);
+                      if (cookievalue) efree(cookievalue);
+			efree(cookie);
+			cookie = php3_PopCookieList();
+			efree(tempstr);
+		}
+		GLOBAL(php3_HeaderPrinted) = 1;
+		GLOBAL(header_called) = 1;
+		send_http_header(GLOBAL(php3_rqst));
+		if (GLOBAL(php3_rqst)->header_only) {
+			set_header_request(1);
+			GLOBAL(header_is_being_sent) = 0;
+			return(0);
+		}
+	}
+#else
+	if (GLOBAL(php3_PrintHeader) && !GLOBAL(php3_HeaderPrinted)) {
+		if (!(GLOBAL(initialized) & INIT_ENVIRONMENT) && GLOBAL(request_info).request_method && !strcasecmp(GLOBAL(request_info).request_method, "post")) {
+			php3_treat_data(PARSE_POST, NULL);	/* POST Data */
+		}
+		if (!GLOBAL(cont_type)) {
+#if USE_SAPI
+			GLOBAL(sapi_rqst)->header(GLOBAL(sapi_rqst)->scid,"Content-type: text/html\015\012\015\012");
+#elif FHTTPD
+			php3_fhttpd_puts_header("Content-type: text/html\r\n");
+#else
+			PUTS_H("Content-type: text/html\015\012\015\012");
+#endif
+		} else {
+#if 0 /*WIN32|WINNT / *M$ does us again*/
+			if (!strcmp(GLOBAL(cont_type),"text/html")){
+#endif
+#if USE_SAPI
+			tempstr=emalloc(strlen(GLOBAL(cont_type))+18);
+			sprintf(tempstr,"Content-type: %s\015\012\015\012",GLOBAL(cont_type));
+			GLOBAL(sapi_rqst)->header(GLOBAL(sapi_rqst)->scid,tempstr);
+			efree(tempstr);
+#elif FHTTPD
+			tempstr = emalloc(strlen(GLOBAL(cont_type))
+							  + sizeof("Content-type:") + 2);
+			if(tempstr) {
+				strcpy(tempstr, "Content-type:");
+				strcpy(tempstr + sizeof("Content-type:") - 1,
+					   GLOBAL(cont_type));
+				strcat(tempstr, "\r\n");
+				php3_fhttpd_puts_header(tempstr);
+				efree(tempstr);
+			}
+#else
+			PUTS_H("Content-type:");
+			PUTS_H(GLOBAL(cont_type));
+			PUTS_H("\015\012\015\012");
+#endif
+			efree(GLOBAL(cont_type));
+#if 0 /*WIN32|WINNT / *M$ does us again*/
+			} else {
+				PUTS_H("\015\012");
+			}/*end excluding output of text/html*/
+#endif
+		}
+#if USE_SAPI
+		GLOBAL(sapi_rqst)->flush(GLOBAL(sapi_rqst)->scid);
+#else
+		fflush(stdout);
+#endif
+		GLOBAL(php3_HeaderPrinted) = 1;
+		GLOBAL(header_called) = 1;
+	}
+#endif
+	GLOBAL(header_is_being_sent) = 0;
+	return(1);
+}
+
+void php3_PushCookieList(char *name, char *value, time_t expires, char *path, char *domain, int secure)
+{
+	CookieList *new;
+	TLS_VARS;
+
+	new = emalloc(sizeof(CookieList));
+	new->next = GLOBAL(top);
+	new->name = name;
+	new->value = value;
+	new->expires = expires;
+	new->path = path;
+	new->domain = domain;
+	new->secure = secure;
+	GLOBAL(top) = new;
+}
+
+CookieList *php3_PopCookieList(void)
+{
+	CookieList *ret;
+	TLS_VARS;
+
+	ret = GLOBAL(top);
+	if (GLOBAL(top))
+		GLOBAL(top) = GLOBAL(top)->next;
+	return (ret);
+}
+
+/* php3_SetCookie(name,value,expires,path,domain,secure) */
+void php3_SetCookie(INTERNAL_FUNCTION_PARAMETERS)
+{
+#if !APACHE
+	char *tempstr;
+#if FHTTPD
+	char *tempstr1;
+#endif
+	int len=0;
+	time_t t;
+	char *r, *dt;
+#endif
+	char *name = NULL, *value = NULL, *path = NULL, *domain = NULL;
+	time_t expires = 0;
+	int secure = 0;
+	pval *arg[6];
+	int arg_count;
+	TLS_VARS;
+
+	arg_count = ARG_COUNT(ht);
+	if (arg_count < 1 || arg_count > 6 || getParametersArray(ht, arg_count, arg) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+	if (GLOBAL(php3_HeaderPrinted) == 1) {
+		php3_error(E_WARNING, "Oops, php3_SetCookie called after header has been sent\n");
+		return;
+	}
+	switch (arg_count) {
+		case 6:
+			convert_to_boolean(arg[5]);
+			secure = arg[5]->value.lval;
+		case 5:
+			convert_to_string(arg[4]);
+			domain = estrndup(arg[4]->value.str.val,arg[4]->value.str.len);
+		case 4:
+			convert_to_string(arg[3]);
+			path = estrndup(arg[3]->value.str.val,arg[3]->value.str.len);
+		case 3:
+			convert_to_long(arg[2]);
+			expires = arg[2]->value.lval;
+		case 2:
+			convert_to_string(arg[1]);
+			value = estrndup(arg[1]->value.str.val,arg[1]->value.str.len);
+		case 1:
+			convert_to_string(arg[0]);
+			name = estrndup(arg[0]->value.str.val,arg[0]->value.str.len);
+	}
+#if APACHE
+	php3_PushCookieList(name, value, expires, path, domain, secure);
+#else
+	if (name) len += strlen(name);
+	if (value) len += strlen(value);
+	if (path) len += strlen(path);
+	if (domain) len += strlen(domain);
+	tempstr = emalloc(len + 100);
+	if (!value || (value && !*value)) {
+		/* 
+		 * MSIE doesn't delete a cookie when you set it to a null value
+		 * so in order to force cookies to be deleted, even on MSIE, we
+		 * pick an expiry date 1 year and 1 second in the past
+		 */
+		sprintf(tempstr, "%s=deleted", name);
+		strcat(tempstr, "; expires=");
+		t = time(NULL) - 31536001;
+		dt = php3_std_date(t);
+		strcat(tempstr, dt);
+		efree(dt);
+	} else {
+		/* FIXME: XXX: this is not binary data safe */
+		r = _php3_urlencode(value, strlen (value));
+		sprintf(tempstr, "%s=%s", name, value ? r : "");
+		if (r) efree(r);
+		if (value) efree(value);
+		value=NULL;
+		if (name) efree(name);
+		name=NULL;
+		if (expires > 0) {
+			strcat(tempstr, "; expires=");
+			dt = php3_std_date(expires);
+			strcat(tempstr, dt);
+			efree(dt);
+		}
+	}
+	if (path && strlen(path)) {
+		strcat(tempstr, "; path=");
+		strcat(tempstr, path);
+		efree(path);
+		path=NULL;
+	}
+	if (domain && strlen(domain)) {
+		strcat(tempstr, "; domain=");
+		strcat(tempstr, domain);
+		efree(domain);
+		domain=NULL;
+	}
+	if (secure) {
+		strcat(tempstr, "; secure");
+	}
+#if USE_SAPI
+	{
+	char *tempstr2=emalloc(strlen(tempstr)+14);
+	sprintf(tempstr2,"Set-Cookie: %s\015\012",tempstr);
+	GLOBAL(sapi_rqst)->header(GLOBAL(sapi_rqst)->scid,tempstr2);
+	efree(tempstr2);
+	}
+#elif FHTTPD
+	tempstr1 = emalloc(strlen(tempstr)
+					  + sizeof("Set-Cookie: ") + 2);
+	if(tempstr1) {
+		strcpy(tempstr1, "Set-Cookie: ");
+		strcpy(tempstr1 + sizeof("Set-Cookie: ") - 1, tempstr);
+		strcat(tempstr1, "\r\n");
+		php3_fhttpd_puts_header(tempstr1);
+		efree(tempstr1);
+	}
+#else
+	PUTS_H("Set-Cookie: ");
+	PUTS_H(tempstr);
+	PUTS_H("\015\012");
+#endif
+	if (domain) efree(domain);
+	if (path) efree(path);
+	if (name) efree(name);
+	if (value) efree(value);
+	efree(tempstr);
+#endif
+}
+
+
+int php3_headers_unsent(void)
+{
+	TLS_VARS;
+	if (GLOBAL(php3_HeaderPrinted)!=1 || !GLOBAL(php3_PrintHeader)) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+
+function_entry php3_header_functions[] = {
+	{"setcookie",		php3_SetCookie,		NULL},
+	{"header",			php3_Header,		NULL},
+	{NULL, NULL, NULL}
+};
+
+
+php3_module_entry php3_header_module_entry = {
+	"PHP_head", php3_header_functions, NULL, NULL, php3_init_head, NULL, NULL, STANDARD_MODULE_PROPERTIES
+};
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
diff --git a/ext/standard/head.h b/ext/standard/head.h
new file mode 100644
index 0000000000..f71f7c9027
--- /dev/null
+++ b/ext/standard/head.h
@@ -0,0 +1,66 @@
+/*
+   +----------------------------------------------------------------------+
+   | 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: Rasmus Lerdorf <rasmus@lerdorf.on.ca>                       |
+   +----------------------------------------------------------------------+
+ */
+#ifndef _HEAD_H
+#define _HEAD_H
+
+
+/* 
+   We are still using a PHP2-style Push/Pop list here as opposed
+   to the PHP3 built-in list functionality because of the nature
+   of this particular list.  It is just used as a structured
+   buffer.  Doing this with the built-in list code would require
+   some changes to allow a search for the first item with a
+   certain type.  This type of search would not be optimal.
+   Private list management makes more sense here
+*/
+typedef struct CookieList {
+	char *name;
+	char *value;
+	time_t expires;
+	char *path;
+	char *domain;
+	int secure;
+	struct CookieList *next;
+} CookieList;
+
+extern php3_module_entry php3_header_module_entry;
+#define php3_header_module_ptr &php3_header_module_entry
+
+extern int php3_init_head(INIT_FUNC_ARGS);
+extern void php3_Header(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_SetCookie(INTERNAL_FUNCTION_PARAMETERS);
+
+void php4i_add_header_information(char *header_information);
+
+extern void php3_noheader(void);
+extern PHPAPI int php3_header(void);
+extern void php3_noheader(void);
+extern int php3_headers_unsent(void);
+
+#endif
diff --git a/ext/standard/info.c b/ext/standard/info.c
index 8eaf6aa28e..b6e5ac26fc 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -33,7 +33,7 @@
 #include "php.h"
 #include "php_ini.h"
 #include "php_globals.h"
-#include "functions/head.h"
+#include "ext/standard/head.h"
 #include "info.h"
 #ifndef MSVC5
 #include "build-defs.h"
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index c1be66847c..83fa1284d5 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -46,7 +46,7 @@
 #else
 #include <sys/param.h>
 #endif
-#include "functions/head.h"
+#include "ext/standard/head.h"
 #include "safe_mode.h"
 #include "php3_string.h"
 #include "pack.h"
diff --git a/ext/standard/php3_crypt.h b/ext/standard/php3_crypt.h
new file mode 100644
index 0000000000..c740dc55ec
--- /dev/null
+++ b/ext/standard/php3_crypt.h
@@ -0,0 +1,13 @@
+#ifndef PHP3_CRYPT_H
+#define PHP3_CRYPT_H
+
+#if HAVE_CRYPT
+extern php3_module_entry crypt_module_entry;
+#define crypt_module_ptr &crypt_module_entry
+extern void php3_crypt(INTERNAL_FUNCTION_PARAMETERS);
+extern int php_minit_crypt(INIT_FUNC_ARGS);
+#else
+#define crypt_module_ptr NULL
+#endif
+
+#endif
diff --git a/ext/standard/php3_standard.h b/ext/standard/php3_standard.h
index 828b3c4de6..77ccafb40f 100644
--- a/ext/standard/php3_standard.h
+++ b/ext/standard/php3_standard.h
@@ -60,6 +60,8 @@
 #include "php3_var.h"
 #include "quot_print.h"
 #include "type.h"
+#include "dl.h"
+#include "php3_crypt.h"
 
 #define standard_module_ptr basic_functions_module_ptr
 
diff --git a/internal_functions.c b/internal_functions.c
index 1f2ea82a03..a935289c47 100644
--- a/internal_functions.c
+++ b/internal_functions.c
@@ -46,8 +46,7 @@
 #include "ext/odbc/php3_odbc.h"
 #include "ext/gettext/php3_gettext.h"
 
-#include "functions/php3_ifx.h"
-#include "functions/php3_crypt.h"
+#include "ext/informix/php3_ifx.h"
 #include "functions/php3_ldap.h"
 #include "ext/mysql/php3_mysql.h"
 #include "ext/bcmath/php3_bcmath.h"
@@ -58,8 +57,7 @@
 #include "functions/php3_sybase.h"
 #include "functions/php3_sybase-ct.h"
 #include "functions/imap.h"
-#include "functions/dl.h"
-#include "functions/head.h"
+#include "ext/standard/head.h"
 #include "functions/post.h"
 #include "ext/hyperwave/hw.h"
 #include "ext/filepro/filepro.h"
@@ -70,7 +68,7 @@
 #include "functions/php3_interbase.h"
 #include "functions/php3_xml.h"
 #include "functions/php3_pdf.h"
-#include "functions/php3_fdf.h"
+#include "ext/fdf/php3_fdf.h"
 #include "functions/php3_sysvsem.h"
 #include "functions/php3_sysvshm.h"
 #include "ext/dav/php3_dav.h"
diff --git a/main/configuration-parser.y b/main/configuration-parser.y
index b54079d6e0..eded973084 100644
--- a/main/configuration-parser.y
+++ b/main/configuration-parser.y
@@ -36,7 +36,7 @@
 #include "php.h"
 #include "php_globals.h"
 #include "php_ini.h"
-#include "functions/dl.h"
+#include "ext/standard/dl.h"
 #include "ext/standard/file.h"
 #include "ext/standard/php3_browscap.h"
 #include "zend_extensions.h"
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 01a550a958..60edb6fae4 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -54,7 +54,7 @@
 
 #include "safe_mode.h"
 #include "php3_realpath.h"
-#include "functions/head.h"
+#include "ext/standard/head.h"
 #include "ext/standard/php3_standard.h"
 #include "zend_compile.h"
 
diff --git a/main/main.c b/main/main.c
index b46b261b8a..e247ea0549 100644
--- a/main/main.c
+++ b/main/main.c
@@ -69,7 +69,7 @@
 #include "fopen-wrappers.h"
 #include "ext/standard/php3_standard.h"
 #include "functions/post.h"
-#include "functions/head.h"
+#include "ext/standard/head.h"
 #include "snprintf.h"
 #if WIN32|WINNT
 #include <io.h>
diff --git a/output.c b/output.c
index 61abce7dc5..d68bd56898 100644
--- a/output.c
+++ b/output.c
@@ -15,7 +15,7 @@
 
 
 #include "php.h"
-#include "functions/head.h"
+#include "ext/standard/head.h"
 
 /* output functions */
 int (*zend_body_write)(const char *str, uint str_length);		/* string output */
diff --git a/setup b/setup
index 973141a689..224f501eb0 100644
--- a/setup
+++ b/setup
@@ -283,11 +283,6 @@ define_option with-pdflib 'pdflib 0.6 support? ' yesnodir \
 '    Whether to use the pdflib support to write .pdf-files.\n
     Tested for version 0.6!'
 
-define_option with-fdftk 'Acrobat Forms (Ftf Toolkit 2.0) support? ' yesnodir \
-    'no /usr/local ftktk install' \
-'    Whether to use the Ftf Toolkit support to write/read .fdf-files.\n
-    Tested for version 2.0!'
-
 define_option with-zlib 'zlib (>= 1.0.9) support? ' yesnodir \
     'no /usr zlib install' \
 '    Whether to use the zlib support to read/write .gz-files.\n
diff --git a/tls.h b/tls.h
index ef1a527b51..c401d1448c 100644
--- a/tls.h
+++ b/tls.h
@@ -36,7 +36,7 @@
 #endif
 
 #include "alloc.h"
-#include "functions/head.h"
+#include "ext/standard/head.h"
 #include "ext/bcmath/number.h"
 #include "constants.h"
 #include <sys/stat.h>