Imported from /home/lorry/working-area/delta_php2/php-5.4.13.tar.bz2.HEADphp-5.4.13master

17 files changed, 5793 insertions, 0 deletions

diff --git a/ext/odbc/CREDITS b/ext/odbc/CREDITS
new file mode 100644
index 0000000..238bfb4
--- /dev/null
+++ b/ext/odbc/CREDITS
@@ -0,0 +1,2 @@
+ODBC
+Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel R. Kalowsky
diff --git a/ext/odbc/birdstep.c b/ext/odbc/birdstep.c
new file mode 100644
index 0000000..0af58d0
--- /dev/null
+++ b/ext/odbc/birdstep.c
@@ -0,0 +1,710 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2013 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Nikolay P. Romanyuk <mag@redcom.ru>                         |
+   +----------------------------------------------------------------------+
+ */
+
+/* $Id$ */
+
+/*
+ * TODO:
+ * birdstep_fetch_into(),
+ * Check all on real life apps.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+
+#if WIN32
+# include "config.w32.h"
+# include "win95nt.h"
+# ifdef PHP_EXPORTS
+#  define PHPAPI __declspec(dllexport) 
+# else
+#  define PHPAPI __declspec(dllimport) 
+# endif
+#else
+# include <php_config.h>
+# define PHPAPI
+# define THREAD_LS
+#endif
+
+#ifdef HAVE_BIRDSTEP
+#include "php_birdstep.h"
+#include "ext/standard/info.h"
+#include "php_ini.h"
+
+/* {{{ arginfo */
+ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_connect, 0, 0, 3)
+	ZEND_ARG_INFO(0, server)
+	ZEND_ARG_INFO(0, user)
+	ZEND_ARG_INFO(0, pass)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_close, 0, 0, 1)
+	ZEND_ARG_INFO(0, id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_exec, 0, 0, 2)
+	ZEND_ARG_INFO(0, index)
+	ZEND_ARG_INFO(0, exec_str)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_fetch, 0, 0, 1)
+	ZEND_ARG_INFO(0, index)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_result, 0, 0, 2)
+	ZEND_ARG_INFO(0, index)
+	ZEND_ARG_INFO(0, col)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_freeresult, 0, 0, 1)
+	ZEND_ARG_INFO(0, index)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_autocommit, 0, 0, 1)
+	ZEND_ARG_INFO(0, index)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_off_autocommit, 0, 0, 1)
+	ZEND_ARG_INFO(0, index)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_commit, 0, 0, 1)
+	ZEND_ARG_INFO(0, index)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_rollback, 0, 0, 1)
+	ZEND_ARG_INFO(0, index)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_fieldname, 0, 0, 2)
+	ZEND_ARG_INFO(0, index)
+	ZEND_ARG_INFO(0, col)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_fieldnum, 0, 0, 1)
+	ZEND_ARG_INFO(0, index)
+ZEND_END_ARG_INFO()
+/* }}} */
+
+const zend_function_entry birdstep_functions[] = {
+	PHP_FE(birdstep_connect,        arginfo_birdstep_connect)
+	PHP_FE(birdstep_close,          arginfo_birdstep_close)
+	PHP_FE(birdstep_exec,           arginfo_birdstep_exec)
+	PHP_FE(birdstep_fetch,          arginfo_birdstep_fetch)
+	PHP_FE(birdstep_result,         arginfo_birdstep_result)
+	PHP_FE(birdstep_freeresult,     arginfo_birdstep_freeresult)
+	PHP_FE(birdstep_autocommit,     arginfo_birdstep_autocommit)
+	PHP_FE(birdstep_off_autocommit, arginfo_birdstep_off_autocommit)
+	PHP_FE(birdstep_commit,         arginfo_birdstep_commit)
+	PHP_FE(birdstep_rollback,       arginfo_birdstep_rollback)
+	PHP_FE(birdstep_fieldnum,       arginfo_birdstep_fieldnum)
+	PHP_FE(birdstep_fieldname,      arginfo_birdstep_fieldname)
+/*
+ * Temporary Function aliases until the next major upgrade to PHP.  
+ * These should allow users to continue to use their current scripts, 
+ * but should in reality warn the user that this functionality is 
+ * deprecated.
+ */
+	PHP_FALIAS(velocis_connect,        birdstep_connect,        arginfo_birdstep_connect)
+	PHP_FALIAS(velocis_close,          birdstep_close,          arginfo_birdstep_close)
+	PHP_FALIAS(velocis_exec,           birdstep_exec,           arginfo_birdstep_exec)
+	PHP_FALIAS(velocis_fetch,          birdstep_fetch,          arginfo_birdstep_fetch)
+	PHP_FALIAS(velocis_result,         birdstep_result,         arginfo_birdstep_result)
+	PHP_FALIAS(velocis_freeresult,     birdstep_freeresult,     arginfo_birdstep_freeresult)
+	PHP_FALIAS(velocis_autocommit,     birdstep_autocommit,     arginfo_birdstep_autocommit)
+	PHP_FALIAS(velocis_off_autocommit, birdstep_off_autocommit, arginfo_birdstep_off_autocommit)
+	PHP_FALIAS(velocis_commit,         birdstep_commit,         arginfo_birdstep_commit)
+	PHP_FALIAS(velocis_rollback,       birdstep_rollback,       arginfo_birdstep_rollback)
+	PHP_FALIAS(velocis_fieldnum,       birdstep_fieldnum,       arginfo_birdstep_fieldnum)
+	PHP_FALIAS(velocis_fieldname,      birdstep_fieldname,      arginfo_birdstep_fieldname)
+/* End temporary aliases */
+	{NULL, NULL, NULL}
+};
+
+zend_module_entry birdstep_module_entry = {
+	STANDARD_MODULE_HEADER,
+	"birdstep",
+	birdstep_functions,
+	PHP_MINIT(birdstep),
+	PHP_MSHUTDOWN(birdstep),
+	PHP_RINIT(birdstep),
+	NULL,
+	PHP_MINFO(birdstep),
+	NO_VERSION_YET,
+	STANDARD_MODULE_PROPERTIES
+};
+
+#ifdef COMPILE_DL_ODBC
+ZEND_GET_MODULE(birdstep)
+#endif
+
+THREAD_LS birdstep_module php_birdstep_module;
+THREAD_LS static HENV henv;
+
+#define PHP_GET_BIRDSTEP_RES_IDX(id) if (!(res = birdstep_find_result(list, id))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Not result index (%ld)", id); RETURN_FALSE; } 
+#define PHP_BIRDSTEP_CHK_LNK(id) if (!(conn = birdstep_find_conn(list, id))) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Not connection index (%ld)", id); RETURN_FALSE; }
+                                                        
+
+static void _close_birdstep_link(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+{
+	VConn *conn = (VConn *)rsrc->ptr;
+
+	if ( conn ) {
+		efree(conn);
+	}
+}
+
+static void _free_birdstep_result(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+{
+	Vresult *res = (Vresult *)rsrc->ptr;
+
+	if ( res && res->values ) {
+		register int i;
+		for ( i=0; i < res->numcols; i++ ) {
+			if ( res->values[i].value )
+				efree(res->values[i].value);
+		}
+		efree(res->values);
+	}
+	if ( res ) {
+		efree(res);
+	}
+}
+
+PHP_MINIT_FUNCTION(birdstep)
+{
+	SQLAllocEnv(&henv);
+
+	if ( cfg_get_long("birdstep.max_links",&php_birdstep_module.max_links) == FAILURE ) {
+		php_birdstep_module.max_links = -1;
+	}
+	php_birdstep_module.num_links = 0;
+	php_birdstep_module.le_link   = zend_register_list_destructors_ex(_close_birdstep_link, NULL, "birdstep link", module_number);
+	php_birdstep_module.le_result = zend_register_list_destructors_ex(_free_birdstep_result, NULL, "birdstep result", module_number);
+
+	return SUCCESS;
+}
+
+PHP_RINIT_FUNCTION(birdstep)
+{
+	return SUCCESS;
+}
+
+
+PHP_MINFO_FUNCTION(birdstep)
+{
+	php_info_print_table_start();
+	php_info_print_table_row(2, "RAIMA Birdstep Support", "enabled" );
+	php_info_print_table_end();
+}
+
+PHP_MSHUTDOWN_FUNCTION(birdstep)
+{
+	SQLFreeEnv(henv);
+	return SUCCESS;
+}
+
+/* Some internal functions. Connections and result manupulate */
+
+static int birdstep_add_conn(HashTable *list,VConn *conn,HDBC hdbc TSRMLS_DC)
+{
+	int ind;
+
+	ind = zend_list_insert(conn,php_birdstep_module.le_link TSRMLS_CC);
+	conn->hdbc = hdbc;
+	conn->index = ind;
+
+	return(ind);
+}
+
+static VConn * birdstep_find_conn(HashTable *list,int ind)
+{
+	VConn *conn;
+	int type;
+
+	conn = zend_list_find(ind,&type);
+	if ( !conn || type != php_birdstep_module.le_link ) {
+		return(NULL);
+	}
+	return(conn);
+}
+
+static void birdstep_del_conn(HashTable *list,int ind)
+{
+	zend_list_delete(ind);
+}
+
+static int birdstep_add_result(HashTable *list,Vresult *res,VConn *conn)
+{
+	int ind;
+
+	ind = zend_list_insert(res,php_birdstep_module.le_result);
+	res->conn = conn;
+	res->index = ind;
+
+	return(ind);
+}
+
+static Vresult * birdstep_find_result(HashTable *list,int ind)
+{
+	Vresult *res;
+	int type;
+
+	res = zend_list_find(ind,&type);
+	if ( !res || type != php_birdstep_module.le_result ) {
+		return(NULL);
+	}
+	return(res);
+}
+
+static void birdstep_del_result(HashTable *list,int ind)
+{
+	zend_list_delete(ind);
+}
+
+/* Users functions */
+
+/* {{{ proto int birdstep_connect(string server, string user, string pass)
+ */
+PHP_FUNCTION(birdstep_connect)
+{
+	char *serv, *user, *pass;
+	int serv_len, user_len, pass_len;
+	RETCODE stat;
+	HDBC hdbc;
+	VConn *new;
+	long ind;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss", &serv, &serv_len, &user, &user_len, &pass, &pass_len) == FAILURE) {
+		return;
+	}
+	
+	if ( php_birdstep_module.max_links != -1 && php_birdstep_module.num_links == php_birdstep_module.max_links ) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Too many open connections (%d)",php_birdstep_module.num_links);
+		RETURN_FALSE;
+	}
+
+	stat = SQLAllocConnect(henv,&hdbc);
+	if ( stat != SQL_SUCCESS ) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Could not allocate connection handle");
+		RETURN_FALSE;
+	}
+	stat = SQLConnect(hdbc, serv, SQL_NTS, user, SQL_NTS, pass, SQL_NTS);
+	if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Could not connect to server \"%s\" for %s", serv, user);
+		SQLFreeConnect(hdbc);
+		RETURN_FALSE;
+	}
+	new = (VConn *)emalloc(sizeof(VConn));
+	ind = birdstep_add_conn(list,new,hdbc TSRMLS_CC);
+	php_birdstep_module.num_links++;
+	RETURN_LONG(ind);
+}
+/* }}} */
+
+/* {{{ proto bool birdstep_close(int id)
+ */
+PHP_FUNCTION(birdstep_close)
+{
+	long id;
+	VConn *conn;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &id) == FAILURE) {
+		return;
+	}
+
+	PHP_BIRDSTEP_CHK_LNK(id);
+
+	SQLDisconnect(conn->hdbc);
+	SQLFreeConnect(conn->hdbc);
+	birdstep_del_conn(list, id);
+	php_birdstep_module.num_links--;
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto int birdstep_exec(int index, string exec_str)
+ */
+PHP_FUNCTION(birdstep_exec)
+{
+	char *query;
+	long ind;
+	int query_len, indx;
+	VConn *conn;
+	Vresult *res;
+	RETCODE stat;
+	SWORD cols,i,colnamelen;
+	SDWORD rows,coldesc;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ls", &ind, &query, &query_len) == FAILURE) {
+		return;
+	}
+
+	PHP_BIRDSTEP_CHK_LNK(ind);
+
+	res = (Vresult *)emalloc(sizeof(Vresult));
+	stat = SQLAllocStmt(conn->hdbc,&res->hstmt);
+	if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: SQLAllocStmt return %d",stat);
+		efree(res);
+		RETURN_FALSE;
+	}
+	stat = SQLExecDirect(res->hstmt,query,SQL_NTS);
+	if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Cannot execute \"%s\" query",query);
+		SQLFreeStmt(res->hstmt,SQL_DROP);
+		efree(res);
+		RETURN_FALSE;
+	}
+	/* Success query */
+	stat = SQLNumResultCols(res->hstmt,&cols);
+	if ( stat != SQL_SUCCESS ) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: SQLNumResultCols return %d",stat);
+		SQLFreeStmt(res->hstmt,SQL_DROP);
+		efree(res);
+		RETURN_FALSE;
+	}
+	if ( !cols ) { /* Was INSERT, UPDATE, DELETE, etc. query */
+		stat = SQLRowCount(res->hstmt,&rows);
+		if ( stat != SQL_SUCCESS ) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: SQLNumResultCols return %d",stat);
+			SQLFreeStmt(res->hstmt,SQL_DROP);
+			efree(res);
+			RETURN_FALSE;
+		}
+		SQLFreeStmt(res->hstmt,SQL_DROP);
+		efree(res);
+		RETURN_LONG(rows);
+	} else {  /* Was SELECT query */
+		res->values = (VResVal *)safe_emalloc(sizeof(VResVal), cols, 0);
+		res->numcols = cols;
+		for ( i = 0; i < cols; i++ ) {
+			SQLColAttributes(res->hstmt,i+1,SQL_COLUMN_NAME,
+			   res->values[i].name,sizeof(res->values[i].name),
+			   &colnamelen,NULL);
+			SQLColAttributes(res->hstmt,i+1,SQL_COLUMN_TYPE,
+			   NULL,0,NULL,&res->values[i].valtype);
+			switch ( res->values[i].valtype ) {
+				case SQL_LONGVARBINARY:
+				case SQL_LONGVARCHAR:
+					res->values[i].value = NULL;
+					continue;
+				default:
+					break;
+			}
+			SQLColAttributes(res->hstmt,i+1,SQL_COLUMN_DISPLAY_SIZE,
+			   NULL,0,NULL,&coldesc);
+			res->values[i].value = (char *)emalloc(coldesc+1);
+			SQLBindCol(res->hstmt,i+1,SQL_C_CHAR, res->values[i].value,coldesc+1, &res->values[i].vallen);
+		}
+	}
+	res->fetched = 0;
+	indx = birdstep_add_result(list,res,conn);
+	RETURN_LONG(indx);
+}
+/* }}} */
+
+/* {{{ proto bool birdstep_fetch(int index)
+ */
+PHP_FUNCTION(birdstep_fetch)
+{
+	long ind;
+	Vresult *res;
+	RETCODE stat;
+	UDWORD  row;
+	UWORD   RowStat[1];
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &ind) == FAILURE) {
+		return;
+	}
+
+	PHP_GET_BIRDSTEP_RES_IDX(ind);
+
+	stat = SQLExtendedFetch(res->hstmt,SQL_FETCH_NEXT,1,&row,RowStat);
+	if ( stat == SQL_NO_DATA_FOUND ) {
+		SQLFreeStmt(res->hstmt,SQL_DROP);
+		birdstep_del_result(list,Z_LVAL_PP(ind));
+		RETURN_FALSE;
+	}
+	if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: SQLFetch return error");
+		SQLFreeStmt(res->hstmt,SQL_DROP);
+		birdstep_del_result(list,Z_LVAL_PP(ind));
+		RETURN_FALSE;
+	}
+	res->fetched = 1;
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto mixed birdstep_result(int index, mixed col)
+ */
+PHP_FUNCTION(birdstep_result)
+{
+	zval **col;
+	long ind;
+	Vresult *res;
+	RETCODE stat;
+	int i,sql_c_type;
+	UDWORD row;
+	UWORD RowStat[1];
+	SWORD indx = -1;
+	char *field = NULL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lZ", &ind, &col) == FAILURE) {
+		return;
+	}
+
+	PHP_GET_BIRDSTEP_RES_IDX(ind);
+
+	if ( Z_TYPE_PP(col) == IS_STRING ) {
+		field = Z_STRVAL_PP(col);
+	} else {
+		convert_to_long_ex(col);
+		indx = Z_LVAL_PP(col);
+	}
+	if ( field ) {
+		for ( i = 0; i < res->numcols; i++ ) {
+			if ( !strcasecmp(res->values[i].name,field)) {
+				indx = i;
+				break;
+			}
+		}
+		if ( indx < 0 ) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING,  "Field %s not found",field);
+			RETURN_FALSE;
+		}
+	} else {
+		if ( indx < 0 || indx >= res->numcols ) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Field index not in range");
+			RETURN_FALSE;
+		}
+	}
+	if ( !res->fetched ) {
+		stat = SQLExtendedFetch(res->hstmt,SQL_FETCH_NEXT,1,&row,RowStat);
+		if ( stat == SQL_NO_DATA_FOUND ) {
+			SQLFreeStmt(res->hstmt,SQL_DROP);
+			birdstep_del_result(list,Z_LVAL_PP(ind));
+			RETURN_FALSE;
+		}
+		if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: SQLFetch return error");
+			SQLFreeStmt(res->hstmt,SQL_DROP);
+			birdstep_del_result(list,Z_LVAL_PP(ind));
+			RETURN_FALSE;
+		}
+		res->fetched = 1;
+	}
+	switch ( res->values[indx].valtype ) {
+		case SQL_LONGVARBINARY:
+			sql_c_type = SQL_C_BINARY;
+			goto l1;
+		case SQL_LONGVARCHAR:
+			sql_c_type = SQL_C_CHAR;
+l1:
+			if ( !res->values[indx].value ) {
+				res->values[indx].value = emalloc(4096);
+			}
+			stat = SQLGetData(res->hstmt,indx+1,sql_c_type,
+				res->values[indx].value,4095,&res->values[indx].vallen);
+			if ( stat == SQL_NO_DATA_FOUND ) {
+				SQLFreeStmt(res->hstmt,SQL_DROP);
+				birdstep_del_result(list,Z_LVAL_PP(ind));
+				RETURN_FALSE;
+			}
+			if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: SQLGetData return error");
+				SQLFreeStmt(res->hstmt,SQL_DROP);
+				birdstep_del_result(list,Z_LVAL_PP(ind));
+				RETURN_FALSE;
+			}
+			if ( res->values[indx].valtype == SQL_LONGVARCHAR ) {
+				RETURN_STRING(res->values[indx].value,TRUE);
+			} else {
+				RETURN_LONG((long)res->values[indx].value);
+			}
+		default:
+			if ( res->values[indx].value != NULL ) {
+				RETURN_STRING(res->values[indx].value,TRUE);
+			}
+	}
+}
+/* }}} */
+
+/* {{{ proto bool birdstep_freeresult(int index)
+ */
+PHP_FUNCTION(birdstep_freeresult)
+{
+	long ind;
+	Vresult *res;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &ind) == FAILURE) {
+		return;
+	}
+
+	PHP_GET_BIRDSTEP_RES_IDX(ind);
+
+	SQLFreeStmt(res->hstmt,SQL_DROP);
+	birdstep_del_result(list, ind);
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool birdstep_autocommit(int index)
+ */
+PHP_FUNCTION(birdstep_autocommit)
+{
+	long id;
+	RETCODE stat;
+	VConn *conn;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &id) == FAILURE) {
+		return;
+	}
+
+	PHP_BIRDSTEP_CHK_LNK(id);
+
+	stat = SQLSetConnectOption(conn->hdbc,SQL_AUTOCOMMIT,SQL_AUTOCOMMIT_ON);
+	if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Set autocommit_on option failure");
+		RETURN_FALSE;
+	}
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool birdstep_off_autocommit(int index)
+ */
+PHP_FUNCTION(birdstep_off_autocommit)
+{
+	long id;
+	RETCODE stat;
+	VConn *conn;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &id) == FAILURE) {
+		return;
+	}
+
+	PHP_BIRDSTEP_CHK_LNK(id);
+
+	stat = SQLSetConnectOption(conn->hdbc,SQL_AUTOCOMMIT,SQL_AUTOCOMMIT_OFF);
+	if ( stat != SQL_SUCCESS && stat != SQL_SUCCESS_WITH_INFO ) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Set autocommit_off option failure");
+		RETURN_FALSE;
+	}
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool birdstep_commit(int index)
+ */
+PHP_FUNCTION(birdstep_commit)
+{
+	long id;
+	RETCODE stat;
+	VConn *conn;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &id) == FAILURE) {
+		return;
+	}
+
+	PHP_BIRDSTEP_CHK_LNK(id)
+
+	stat = SQLTransact(NULL,conn->hdbc,SQL_COMMIT);
+	if ( stat != SQL_SUCCESS ) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Commit failure");
+		RETURN_FALSE;
+	}
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto bool birdstep_rollback(int index)
+ */
+PHP_FUNCTION(birdstep_rollback)
+{
+	long id;
+	RETCODE stat;
+	VConn *conn;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &id) == FAILURE) {
+		return;
+	}
+
+	PHP_BIRDSTEP_CHK_LNK(id);
+
+	stat = SQLTransact(NULL,conn->hdbc,SQL_ROLLBACK);
+	if ( stat != SQL_SUCCESS ) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Rollback failure");
+		RETURN_FALSE;
+	}
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string birdstep_fieldname(int index, int col)
+ */
+PHP_FUNCTION(birdstep_fieldname)
+{
+	long ind, col;
+	Vresult *res;
+	SWORD indx;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &ind, &col) == FAILURE) {
+		return;
+	}
+
+	PHP_GET_BIRDSTEP_RES_IDX(ind);
+
+	indx = col;
+	if ( indx < 0 || indx >= res->numcols ) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Birdstep: Field index not in range");
+		RETURN_FALSE;
+	}
+	RETURN_STRING(res->values[indx].name,TRUE);
+}
+/* }}} */
+
+/* {{{ proto int birdstep_fieldnum(int index)
+ */
+PHP_FUNCTION(birdstep_fieldnum)
+{
+	long ind;
+	Vresult *res;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &ind) == FAILURE) {
+		return;
+	}
+
+	PHP_GET_BIRDSTEP_RES_IDX(ind);
+
+	RETURN_LONG(res->numcols);
+}
+/* }}} */
+
+#endif /* HAVE_BIRDSTEP */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
new file mode 100644
index 0000000..5be3288
--- /dev/null
+++ b/ext/odbc/config.m4
@@ -0,0 +1,500 @@
+dnl
+dnl $Id$
+dnl
+
+AC_DEFUN([PHP_ODBC_CHECK_HEADER],[
+if ! test -f "$ODBC_INCDIR/$1"; then
+  AC_MSG_ERROR([ODBC header file '$ODBC_INCDIR/$1' not found!])
+fi
+])
+
+dnl
+dnl Figure out which library file to link with for the Solid support.
+dnl
+AC_DEFUN([PHP_ODBC_FIND_SOLID_LIBS],[
+  AC_MSG_CHECKING([Solid library file])  
+  ac_solid_uname_r=`uname -r 2>/dev/null`
+  ac_solid_uname_s=`uname -s 2>/dev/null`
+  case $ac_solid_uname_s in
+    AIX) ac_solid_os=a3x;;   # a4x for AIX4/ Solid 2.3/3.0 only
+    HP-UX) ac_solid_os=h9x;; # h1x for hpux11, h0x for hpux10
+    IRIX) ac_solid_os=irx;;  # Solid 2.3(?)/ 3.0 only
+    Linux) 
+      if ldd -v /bin/sh | grep GLIBC > /dev/null; then
+        AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ])
+        ac_solid_os=l2x
+      else
+        AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ])
+        ac_solid_os=lux
+      fi;; 
+    SunOS) 
+      ac_solid_os=ssx;; # should we deal with SunOS 4?
+    FreeBSD) 
+      if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then
+        AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ])
+        ac_solid_os=fex
+      else 
+        AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ])
+        ac_solid_os=fbx
+      fi;;
+  esac
+
+  if test -f $1/soc${ac_solid_os}35.a; then
+    ac_solid_version=35
+    ac_solid_prefix=soc
+  elif test -f $1/scl${ac_solid_os}30.a; then
+    ac_solid_version=30
+    ac_solid_prefix=scl
+  elif test -f $1/scl${ac_solid_os}23.a; then
+    ac_solid_version=23
+    ac_solid_prefix=scl
+  fi
+
+#
+# Check for the library files, and setup the ODBC_LIBS path...
+#
+if test ! -f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -a \
+  ! -f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a; then
+  #
+  # we have an error and should bail out, as we can't find the libs!
+  #
+  echo ""
+  echo "*********************************************************************"
+  echo "* Unable to locate $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so or $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a"
+  echo "* Please correct this by creating the following links and reconfiguring:"
+  echo "* $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a -> $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a"
+  echo "* $1/${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -> $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so"
+  echo "*********************************************************************"
+else
+  ODBC_LFLAGS=-L$1
+  ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version}
+fi
+
+  AC_MSG_RESULT(`echo $ODBC_LIBS | sed -e 's!.*/!!'`)
+])
+
+
+dnl
+dnl Figure out which library file to link with for the Empress support.
+dnl
+
+AC_DEFUN([PHP_ODBC_FIND_EMPRESS_LIBS],[
+  AC_MSG_CHECKING([Empress library file])
+  ODBC_LIBS=`echo $1/libempodbccl.so | cut -d' ' -f1`
+  if test ! -f $ODBC_LIBS; then
+    ODBC_LIBS=`echo $1/libempodbccl.so | cut -d' ' -f1`
+  fi
+  AC_MSG_RESULT(`echo $ODBC_LIBS | sed -e 's!.*/!!'`)
+])
+
+AC_DEFUN([PHP_ODBC_FIND_EMPRESS_BCS_LIBS],[
+  AC_MSG_CHECKING([Empress local access library file])
+  ODBCBCS_LIBS=`echo $1/libempodbcbcs.a | cut -d' ' -f1`
+  if test ! -f $ODBCBCS_LIBS; then
+    ODBCBCS_LIBS=`echo $1/libempodbcbcs.a | cut -d' ' -f1`
+  fi
+  AC_MSG_RESULT(`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'`)
+])
+
+dnl
+dnl configure options
+dnl
+if test -z "$ODBC_TYPE"; then
+PHP_ARG_WITH(adabas,,
+[  --with-adabas[=DIR]     Include Adabas D support [/usr/local]])
+
+  if test "$PHP_ADABAS" != "no"; then
+    AC_MSG_CHECKING([for Adabas support])
+    if test "$PHP_ADABAS" = "yes"; then
+      PHP_ADABAS=/usr/local
+    fi
+    PHP_ADD_INCLUDE($PHP_ADABAS/incl)
+    PHP_ADD_LIBPATH($PHP_ADABAS/$PHP_LIBDIR)
+    ODBC_OBJS="$PHP_ADABAS/$PHP_LIBDIR/odbclib.a"
+    ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a"
+    $srcdir/build/shtool mkdir -f -p ext/odbc
+    rm -f "$ODBC_LIB"
+    cp "$ODBC_OBJS" "$ODBC_LIB"
+    PHP_ADD_LIBRARY(sqlptc)
+    PHP_ADD_LIBRARY(sqlrte)
+    PHP_ADD_LIBRARY_WITH_PATH(odbc_adabas, $abs_builddir/ext/odbc)
+    ODBC_TYPE=adabas
+    ODBC_INCDIR=$PHP_ADABAS/incl
+    PHP_ODBC_CHECK_HEADER(sqlext.h)
+    AC_DEFINE(HAVE_ADABAS,1,[ ])
+    AC_MSG_RESULT([$ext_output])
+  fi
+fi
+
+if test -z "$ODBC_TYPE"; then
+PHP_ARG_WITH(sapdb,,
+[  --with-sapdb[=DIR]      Include SAP DB support [/usr/local]])
+
+  if test "$PHP_SAPDB" != "no"; then
+    AC_MSG_CHECKING([for SAP DB support])
+    if test "$PHP_SAPDB" = "yes"; then
+      PHP_SAPDB=/usr/local
+    fi
+    PHP_ADD_INCLUDE($PHP_SAPDB/incl)
+    PHP_ADD_LIBPATH($PHP_SAPDB/$PHP_LIBDIR)
+    PHP_ADD_LIBRARY(sqlod)
+    ODBC_TYPE=sapdb
+    AC_DEFINE(HAVE_SAPDB,1,[ ])
+    AC_MSG_RESULT([$ext_output])
+  fi
+fi
+
+if test -z "$ODBC_TYPE"; then
+PHP_ARG_WITH(solid,,
+[  --with-solid[=DIR]      Include Solid support [/usr/local/solid]])
+
+  if test "$PHP_SOLID" != "no"; then
+    AC_MSG_CHECKING(for Solid support)
+    if test "$PHP_SOLID" = "yes"; then
+      PHP_SOLID=/usr/local/solid
+    fi
+    ODBC_INCDIR=$PHP_SOLID/include
+    ODBC_LIBDIR=$PHP_SOLID/$PHP_LIBDIR
+    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_TYPE=solid
+    if test -f $ODBC_LIBDIR/soc*35.a; then
+      AC_DEFINE(HAVE_SOLID_35,1,[ ])
+    elif test -f $ODBC_LIBDIR/scl*30.a; then
+      AC_DEFINE(HAVE_SOLID_30,1,[ ])
+    elif test -f $ODBC_LIBDIR/scl*23.a; then
+      AC_DEFINE(HAVE_SOLID,1,[ ])
+    fi
+    AC_MSG_RESULT([$ext_output])
+    PHP_ODBC_FIND_SOLID_LIBS($ODBC_LIBDIR)
+  fi
+fi
+
+if test -z "$ODBC_TYPE"; then
+PHP_ARG_WITH(ibm-db2,,
+[  --with-ibm-db2[=DIR]    Include IBM DB2 support [/home/db2inst1/sqllib]])
+
+  if test "$PHP_IBM_DB2" != "no"; then
+    AC_MSG_CHECKING(for IBM DB2 support)
+    if test "$PHP_IBM_DB2" = "yes"; then
+      ODBC_INCDIR=/home/db2inst1/sqllib/include
+      ODBC_LIBDIR=/home/db2inst1/sqllib/lib
+    else
+      ODBC_INCDIR=$PHP_IBM_DB2/include
+      ODBC_LIBDIR=$PHP_IBM_DB2/$PHP_LIBDIR
+    fi
+
+    PHP_ODBC_CHECK_HEADER(sqlcli1.h)
+
+    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_LFLAGS=-L$ODBC_LIBDIR
+    ODBC_TYPE=ibm-db2
+    ODBC_LIBS=-ldb2
+
+    PHP_TEST_BUILD(SQLExecute, [
+      AC_DEFINE(HAVE_IBMDB2,1,[ ])
+      AC_MSG_RESULT([$ext_output])
+    ], [
+      AC_MSG_RESULT(no)
+      AC_MSG_ERROR([
+build test failed. Please check the config.log for details.
+You need to source your DB2 environment before running PHP configure:
+# . \$IBM_DB2/db2profile
+])
+    ], [
+      $ODBC_LFLAGS $ODBC_LIBS
+    ])
+  fi
+fi
+
+if test -z "$ODBC_TYPE"; then
+PHP_ARG_WITH(ODBCRouter,,
+[  --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]])
+
+  if test "$PHP_ODBCROUTER" != "no"; then
+    AC_MSG_CHECKING(for ODBCRouter.com support)
+    if test "$PHP_ODBCROUTER" = "yes"; then
+      PHP_ODBCROUTER=/usr
+    fi
+    ODBC_INCDIR=$PHP_ODBCROUTER/include
+    ODBC_LIBDIR=$PHP_ODBCROUTER/lib
+    ODBC_LFLAGS=-L$ODBC_LIBDIR
+    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_LIBS=-lodbcsdk
+    ODBC_TYPE=ODBCRouter
+    AC_DEFINE(HAVE_ODBC_ROUTER,1,[ ])
+    AC_MSG_RESULT([$ext_output])
+  fi
+fi
+
+if test -z "$ODBC_TYPE"; then
+PHP_ARG_WITH(empress,,
+[  --with-empress[=DIR]    Include Empress support [\$EMPRESSPATH]
+                          (Empress Version >= 8.60 required)])
+
+  if test "$PHP_EMPRESS" != "no"; then
+    AC_MSG_CHECKING(for Empress support)
+    if test "$PHP_EMPRESS" = "yes"; then
+      ODBC_INCDIR=$EMPRESSPATH/include/odbc
+      ODBC_LIBDIR=$EMPRESSPATH/shlib
+    else
+      ODBC_INCDIR=$PHP_EMPRESS/include/odbc
+      ODBC_LIBDIR=$PHP_EMPRESS/shlib
+    fi
+    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_LFLAGS=-L$ODBC_LIBDIR
+    ODBC_TYPE=empress
+    AC_DEFINE(HAVE_EMPRESS,1,[ ])
+    AC_MSG_RESULT([$ext_output])
+    PHP_ODBC_FIND_EMPRESS_LIBS($ODBC_LIBDIR)
+  fi
+fi
+
+if test -z "$ODBC_TYPE"; then
+PHP_ARG_WITH(empress-bcs,,
+[  --with-empress-bcs[=DIR]
+                          Include Empress Local Access support [\$EMPRESSPATH]
+                          (Empress Version >= 8.60 required)])
+
+  if test "$PHP_EMPRESS_BCS" != "no"; then
+    AC_MSG_CHECKING(for Empress local access support)
+    if test "$PHP_EMPRESS_BCS" = "yes"; then
+      ODBC_INCDIR=$EMPRESSPATH/include/odbc
+      ODBC_LIBDIR=$EMPRESSPATH/shlib
+    else
+      ODBC_INCDIR=$PHP_EMPRESS_BCS/include/odbc
+      ODBC_LIBDIR=$PHP_EMPRESS_BCS/shlib
+    fi
+    CC="empocc -bcs";export CC;
+    LD="empocc -bcs";export LD;
+    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_LFLAGS=-L$ODBC_LIBDIR
+    LIST=`empocc -listlines -bcs -o a a.c`
+
+    NEWLIST=
+    for I in $LIST
+    do
+      case $I in
+        $EMPRESSPATH/odbccl/lib/* | \
+        $EMPRESSPATH/rdbms/lib/* | \
+        $EMPRESSPATH/common/lib/*)
+              NEWLIST="$NEWLIST $I"
+              ;;
+      esac
+    done
+    ODBC_LIBS="-lempphpbcs -lms -lmscfg -lbasic -lbasic_os -lnlscstab -lnlsmsgtab -lm -ldl -lcrypt"
+    ODBC_TYPE=empress-bcs
+    AC_DEFINE(HAVE_EMPRESS,1,[ ])
+    AC_MSG_RESULT([$ext_output])
+    PHP_ODBC_FIND_EMPRESS_BCS_LIBS($ODBC_LIBDIR)
+  fi
+fi
+
+if test -z "$ODBC_TYPE"; then
+PHP_ARG_WITH(birdstep,,
+[  --with-birdstep[=DIR]   Include Birdstep support [/usr/local/birdstep]])
+  
+  if test "$PHP_BIRDSTEP" != "no"; then
+    AC_MSG_CHECKING(for Birdstep support)
+    if test "$PHP_BIRDSTEP" = "yes"; then
+        ODBC_INCDIR=/usr/local/birdstep/include
+        ODBC_LIBDIR=/usr/local/birdstep/lib
+    else
+        ODBC_INCDIR=$PHP_BIRDSTEP/include
+        ODBC_LIBDIR=$PHP_BIRDSTEP/$PHP_LIBDIR
+    fi
+   
+    case $host_alias in
+      *aix*[)]
+        AC_DEFINE(AIX,1,[ ]);;
+      *hpux*[)]
+        AC_DEFINE(HPUX,1,[ ]);;
+      *linux*[)]
+        AC_DEFINE(LINUX,1,[ ]);;
+      *qnx*[)]
+        AC_DEFINE(NEUTRINO,1,[ ]);;
+      i?86-*-solaris*[)]
+        AC_DEFINE(ISOLARIS,1,[ ]);;
+      sparc-*-solaris*[)]
+        AC_DEFINE(SOLARIS,1,[ ]);;
+      *unixware*[)]
+        AC_DEFINE(UNIXWARE,1,[ ]);;
+    esac
+
+    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_TYPE=birdstep
+    ODBC_LFLAGS=-L$ODBC_LIBDIR
+    ODBC_LIBS="-lCadm -lCdict -lCenc -lCrdm -lCrpc -lCrdbc -lCrm -lCuapi -lutil"
+
+    if test -f "$ODBC_LIBDIR/libCrdbc32.$SHLIB_SUFFIX_NAME"; then
+      ODBC_LIBS="-lCrdbc32 -lCadm32 -lCncp32 -lCrm32 -lCsql32 -lCdict32 -lCrdm32 -lCrpc32 -lutil"
+    elif test -f "$ODBC_LIBDIR/libCrdbc.$SHLIB_SUFFIX_NAME"; then
+      ODBC_LIBS="-lCrdbc -lCadm -lCncp -lCrm -lCsql -lCdict -lCrdm -lCrpc -lutil"
+    fi
+
+    AC_DEFINE(HAVE_BIRDSTEP,1,[ ])
+    AC_MSG_RESULT([$ext_output])
+  fi
+fi
+
+if test -z "$ODBC_TYPE"; then
+PHP_ARG_WITH(custom-odbc,,
+[  --with-custom-odbc[=DIR]
+                          Include user defined ODBC support. DIR is ODBC install base
+                          directory [/usr/local]. Make sure to define CUSTOM_ODBC_LIBS and
+                          have some odbc.h in your include dirs. f.e. you should define 
+                          following for Sybase SQL Anywhere 5.5.00 on QNX, prior to
+                          running this configure script:
+                              CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
+                              LDFLAGS=-lunix
+                              CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"])
+
+  if test "$PHP_CUSTOM_ODBC" != "no"; then
+    AC_MSG_CHECKING(for a custom ODBC support)
+    if test "$PHP_CUSTOM_ODBC" = "yes"; then
+      PHP_CUSTOM_ODBC=/usr/local
+    fi
+    ODBC_INCDIR=$PHP_CUSTOM_ODBC/include
+    ODBC_LIBDIR=$PHP_CUSTOM_ODBC/$PHP_LIBDIR
+    ODBC_LFLAGS=-L$ODBC_LIBDIR
+    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_LIBS=$CUSTOM_ODBC_LIBS
+    ODBC_TYPE=custom-odbc
+    AC_DEFINE(HAVE_CODBC,1,[ ])
+    AC_MSG_RESULT([$ext_ouput])
+  fi
+fi
+
+if test -z "$ODBC_TYPE"; then
+PHP_ARG_WITH(iodbc,,
+[  --with-iodbc[=DIR]      Include iODBC support [/usr/local]])
+
+  if test "$PHP_IODBC" != "no"; then
+    AC_MSG_CHECKING(for iODBC support)
+    if test "$PHP_IODBC" = "yes"; then
+      PHP_IODBC=/usr/local
+    fi
+    PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
+    PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
+    ODBC_TYPE=iodbc
+    ODBC_INCLUDE=-I$PHP_IODBC/include
+    ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
+    ODBC_LIBS=-liodbc
+    AC_DEFINE(HAVE_IODBC,1,[ ])
+    AC_DEFINE(HAVE_ODBC2,1,[ ])
+    AC_MSG_RESULT([$ext_output])
+  fi
+fi
+
+if test -z "$ODBC_TYPE"; then
+PHP_ARG_WITH(esoob,,
+[  --with-esoob[=DIR]      Include Easysoft OOB support [/usr/local/easysoft/oob/client]])
+
+  if test "$PHP_ESOOB" != "no"; then
+    AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
+    if test "$PHP_ESOOB" = "yes"; then
+      PHP_ESOOB=/usr/local/easysoft/oob/client
+    fi
+    ODBC_INCDIR=$PHP_ESOOB/include
+    ODBC_LIBDIR=$PHP_ESOOB/$PHP_LIBDIR
+    ODBC_LFLAGS=-L$ODBC_LIBDIR
+    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_LIBS=-lesoobclient
+    ODBC_TYPE=esoob
+    AC_DEFINE(HAVE_ESOOB,1,[ ])
+    AC_MSG_RESULT([$ext_output])
+  fi
+fi
+
+if test -z "$ODBC_TYPE"; then
+PHP_ARG_WITH(unixODBC,,
+[  --with-unixODBC[=DIR]   Include unixODBC support [/usr/local]])
+
+  if test "$PHP_UNIXODBC" != "no"; then
+    AC_MSG_CHECKING(for unixODBC support)
+    if test "$PHP_UNIXODBC" = "yes"; then
+      PHP_UNIXODBC=/usr/local
+    fi
+    ODBC_INCDIR=$PHP_UNIXODBC/include
+    ODBC_LIBDIR=$PHP_UNIXODBC/$PHP_LIBDIR
+    ODBC_LFLAGS=-L$ODBC_LIBDIR
+    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_LIBS=-lodbc
+    ODBC_TYPE=unixODBC
+    PHP_ODBC_CHECK_HEADER(sqlext.h)
+    AC_DEFINE(HAVE_UNIXODBC,1,[ ])
+    AC_MSG_RESULT([$ext_output])
+  fi
+fi
+
+if test -z "$ODBC_TYPE"; then
+PHP_ARG_WITH(dbmaker,,
+[  --with-dbmaker[=DIR]    Include DBMaker support])
+
+  if test "$PHP_DBMAKER" != "no"; then
+    AC_MSG_CHECKING(for DBMaker support)
+    if test "$PHP_DBMAKER" = "yes"; then
+      # find dbmaker's home directory
+      DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'`
+
+      # check DBMaker version (from 5.0 to 2.0)
+      DBMAKER_VERSION=5.0
+
+      while test ! -d $DBMAKER_HOME/$DBMAKER_VERSION -a "$DBMAKER_VERSION" != "2.9"; do
+        DM_VER=`echo $DBMAKER_VERSION | sed -e 's/\.//' | $AWK '{ print $1-1;}'`
+        MAJOR_V=`echo $DM_VER | $AWK '{ print $1/10; }'  | $AWK -F. '{ print $1; }'`
+        MINOR_V=`echo $DM_VER | $AWK '{ print $1%10; }'`
+        DBMAKER_VERSION=$MAJOR_V.$MINOR_V
+      done
+
+      if test "$DBMAKER_VERSION" = "2.9"; then
+        PHP_DBMAKER=$DBMAKER_HOME
+      else
+        PHP_DBMAKER=$DBMAKER_HOME/$DBMAKER_VERSION
+      fi
+    fi
+
+    ODBC_INCDIR=$PHP_DBMAKER/include
+    ODBC_LIBDIR=$PHP_DBMAKER/$PHP_LIBDIR
+    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_LFLAGS=-L$ODBC_LIBDIR
+    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_LIBS="-ldmapic -lc"
+    ODBC_TYPE=dbmaker
+
+    AC_DEFINE(HAVE_DBMAKER,1,[Whether you want DBMaker])
+
+    if test "$ext_shared" = "yes"; then
+      AC_MSG_RESULT([yes (shared)])
+      ODBC_LIBS="-ldmapic -lc -lm"
+      ODBC_SHARED="odbc.la"
+    else
+      AC_MSG_RESULT([yes (static)])
+      PHP_ADD_LIBRARY_WITH_PATH(dmapic, $ODBC_LIBDIR)
+      PHP_ADD_INCLUDE($ODBC_INCDIR)
+      ODBC_STATIC="libphpext_odbc.la"
+    fi
+  fi
+fi
+
+dnl
+dnl Extension setup
+dnl
+if test -n "$ODBC_TYPE"; then
+  if test "$ODBC_TYPE" != "dbmaker"; then
+    PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], ODBC_SHARED_LIBADD)
+    if test "$ODBC_TYPE" != "birdstep" && test "$ODBC_TYPE" != "solid"; then
+      AC_DEFINE(HAVE_SQLDATASOURCES,1,[ ])
+    fi
+  fi
+  
+  AC_DEFINE(HAVE_UODBC,1,[ ])
+  PHP_SUBST(ODBC_SHARED_LIBADD)
+  PHP_SUBST(ODBC_INCDIR)
+  PHP_SUBST(ODBC_LIBDIR)
+  PHP_SUBST_OLD(ODBC_INCLUDE)
+  PHP_SUBST_OLD(ODBC_LIBS)
+  PHP_SUBST_OLD(ODBC_LFLAGS)
+  PHP_SUBST_OLD(ODBC_TYPE)
+
+  PHP_NEW_EXTENSION(odbc, php_odbc.c, $ext_shared,, $ODBC_INCLUDE)
+fi
diff --git a/ext/odbc/config.w32 b/ext/odbc/config.w32
new file mode 100644
index 0000000..2395ddc
--- /dev/null
+++ b/ext/odbc/config.w32
@@ -0,0 +1,16 @@
+// $Id$
+// vim:ft=javascript
+
+ARG_ENABLE("odbc", "ODBC support", "yes");
+
+if (PHP_ODBC == "yes") {
+	if (CHECK_LIB("odbc32.lib", "odbc") && CHECK_LIB("odbccp32.lib", "odbc")
+	&& CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_ODBC")
+	&& CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_ODBC")) {
+		EXTENSION("odbc", "php_odbc.c");
+		AC_DEFINE("HAVE_UODBC", 1, "ODBC support");
+	} else {
+		WARNING("odbc support can't be enabled, libraries or header are missing (SDK)")
+		PHP_ODBC = "no"
+	}
+}
\ No newline at end of file
diff --git a/ext/odbc/php_birdstep.h b/ext/odbc/php_birdstep.h
new file mode 100644
index 0000000..17f4fde
--- /dev/null
+++ b/ext/odbc/php_birdstep.h
@@ -0,0 +1,92 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2013 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Nikolay P. Romanyuk <mag@redcom.ru>                         |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef PHP_BIRDSTEP_H
+#define PHP_BIRDSTEP_H
+
+#if defined(HAVE_BIRDSTEP) && !HAVE_UODBC
+#define UNIX
+#include <sql.h>
+#include <sqlext.h>
+
+typedef struct VConn {
+	HDBC    hdbc;
+	long    index;
+} VConn;
+
+typedef struct {
+	char name[32];
+	char *value;
+	long vallen;
+	SDWORD valtype;
+} VResVal;
+
+typedef struct Vresult {
+	HSTMT   hstmt;
+	VConn   *conn; 
+	long    index;
+	VResVal *values;
+	long    numcols;
+	int     fetched;
+} Vresult;
+
+typedef struct {
+	long num_links;
+	long max_links;
+	int le_link,le_result;
+} birdstep_module;
+
+extern zend_module_entry birdstep_module_entry;
+#define birdstep_module_ptr &birdstep_module_entry
+
+/* birdstep.c functions */
+PHP_MINIT_FUNCTION(birdstep);
+PHP_RINIT_FUNCTION(birdstep);
+PHP_MINFO_FUNCTION(birdstep);
+PHP_MSHUTDOWN_FUNCTION(birdstep);
+
+PHP_FUNCTION(birdstep_connect);
+PHP_FUNCTION(birdstep_close);
+PHP_FUNCTION(birdstep_exec);
+PHP_FUNCTION(birdstep_fetch);
+PHP_FUNCTION(birdstep_result);
+PHP_FUNCTION(birdstep_freeresult);
+PHP_FUNCTION(birdstep_autocommit);
+PHP_FUNCTION(birdstep_off_autocommit);
+PHP_FUNCTION(birdstep_commit);
+PHP_FUNCTION(birdstep_rollback);
+PHP_FUNCTION(birdstep_fieldnum);
+PHP_FUNCTION(birdstep_fieldname);
+
+extern birdstep_module php_birdstep_module;
+
+#else
+
+#define birdstep_module_ptr NULL
+
+#endif /* HAVE_BIRDSTEP */
+#endif /* PHP_BIRDSTEP_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
new file mode 100644
index 0000000..adb7272
--- /dev/null
+++ b/ext/odbc/php_odbc.c
@@ -0,0 +1,3793 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2013 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Stig Sæther Bakken <ssb@php.net>                            |
+   |          Andreas Karajannis <Andreas.Karajannis@gmd.de>              |
+   |          Frank M. Kromann <frank@kromann.info>  Support for DB/2 CLI |
+   |          Kevin N. Shallow <kshallow@tampabay.rr.com> Birdstep Support|
+   |          Daniel R. Kalowsky <kalowsky@php.net>                       |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+ 
+#include "php.h"
+#include "php_globals.h"
+
+#include "ext/standard/info.h"
+#include "ext/standard/php_string.h"
+#include "ext/standard/php_standard.h"
+
+#include "php_odbc.h"
+#include "php_odbc_includes.h"
+#include "php_globals.h"
+
+#if HAVE_UODBC
+
+#include <fcntl.h>
+#include "ext/standard/head.h"
+#include "php_ini.h"
+
+#ifdef PHP_WIN32
+#include <winsock2.h>
+
+#define ODBC_TYPE "Win32"
+#define PHP_ODBC_TYPE ODBC_TYPE
+
+#endif
+
+/*
+ * not defined elsewhere
+ */
+
+#ifndef TRUE
+#define TRUE 1
+#define FALSE 0
+#endif
+
+void odbc_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent);
+
+static int le_result, le_conn, le_pconn;
+
+#define SAFE_SQL_NTS(n) ((SQLSMALLINT) ((n)?(SQL_NTS):0))
+
+/* {{{ arginfo */
+ZEND_BEGIN_ARG_INFO(arginfo_odbc_close_all, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_binmode, 0, 0, 2)
+	ZEND_ARG_INFO(0, result_id)
+	ZEND_ARG_INFO(0, mode)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_longreadlen, 0, 0, 2)
+	ZEND_ARG_INFO(0, result_id)
+	ZEND_ARG_INFO(0, length)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_prepare, 0, 0, 2)
+	ZEND_ARG_INFO(0, connection_id)
+	ZEND_ARG_INFO(0, query)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_execute, 0, 0, 1)
+	ZEND_ARG_INFO(0, result_id)
+	ZEND_ARG_INFO(0, parameters_array)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_cursor, 0, 0, 1)
+	ZEND_ARG_INFO(0, result_id)
+ZEND_END_ARG_INFO()
+
+#ifdef HAVE_SQLDATASOURCES
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_data_source, 0, 0, 2)
+	ZEND_ARG_INFO(0, connection_id)
+	ZEND_ARG_INFO(0, fetch_type)
+ZEND_END_ARG_INFO()
+#endif
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_exec, 0, 0, 2)
+	ZEND_ARG_INFO(0, connection_id)
+	ZEND_ARG_INFO(0, query)
+	ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO()
+
+#ifdef PHP_ODBC_HAVE_FETCH_HASH
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_object, 0, 0, 1)
+	ZEND_ARG_INFO(0, result)
+	ZEND_ARG_INFO(0, rownumber)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_array, 0, 0, 1)
+	ZEND_ARG_INFO(0, result)
+	ZEND_ARG_INFO(0, rownumber)
+ZEND_END_ARG_INFO()
+#endif
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_into, 0, 0, 2)
+	ZEND_ARG_INFO(0, result_id)
+	ZEND_ARG_INFO(1, result_array)
+	ZEND_ARG_INFO(0, rownumber)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_row, 0, 0, 1)
+	ZEND_ARG_INFO(0, result_id)
+	ZEND_ARG_INFO(0, row_number)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_result, 0, 0, 2)
+	ZEND_ARG_INFO(0, result_id)
+	ZEND_ARG_INFO(0, field)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_result_all, 0, 0, 1)
+	ZEND_ARG_INFO(0, result_id)
+	ZEND_ARG_INFO(0, format)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_free_result, 0, 0, 1)
+	ZEND_ARG_INFO(0, result_id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_connect, 0, 0, 3)
+	ZEND_ARG_INFO(0, dsn)
+	ZEND_ARG_INFO(0, user)
+	ZEND_ARG_INFO(0, password)
+	ZEND_ARG_INFO(0, cursor_option)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_pconnect, 0, 0, 3)
+	ZEND_ARG_INFO(0, dsn)
+	ZEND_ARG_INFO(0, user)
+	ZEND_ARG_INFO(0, password)
+	ZEND_ARG_INFO(0, cursor_option)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_close, 0, 0, 1)
+	ZEND_ARG_INFO(0, connection_id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_num_rows, 0, 0, 1)
+	ZEND_ARG_INFO(0, result_id)
+ZEND_END_ARG_INFO()
+
+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_next_result, 0, 0, 1)
+	ZEND_ARG_INFO(0, result_id)
+ZEND_END_ARG_INFO()
+#endif
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_num_fields, 0, 0, 1)
+	ZEND_ARG_INFO(0, result_id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_name, 0, 0, 2)
+	ZEND_ARG_INFO(0, result_id)
+	ZEND_ARG_INFO(0, field_number)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_type, 0, 0, 2)
+	ZEND_ARG_INFO(0, result_id)
+	ZEND_ARG_INFO(0, field_number)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_len, 0, 0, 2)
+	ZEND_ARG_INFO(0, result_id)
+	ZEND_ARG_INFO(0, field_number)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_scale, 0, 0, 2)
+	ZEND_ARG_INFO(0, result_id)
+	ZEND_ARG_INFO(0, field_number)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_num, 0, 0, 2)
+	ZEND_ARG_INFO(0, result_id)
+	ZEND_ARG_INFO(0, field_name)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_autocommit, 0, 0, 1)
+	ZEND_ARG_INFO(0, connection_id)
+	ZEND_ARG_INFO(0, onoff)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_commit, 0, 0, 1)
+	ZEND_ARG_INFO(0, connection_id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_rollback, 0, 0, 1)
+	ZEND_ARG_INFO(0, connection_id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_error, 0, 0, 0)
+	ZEND_ARG_INFO(0, connection_id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_errormsg, 0, 0, 0)
+	ZEND_ARG_INFO(0, connection_id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_setoption, 0, 0, 4)
+	ZEND_ARG_INFO(0, conn_id)
+	ZEND_ARG_INFO(0, which)
+	ZEND_ARG_INFO(0, option)
+	ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_tables, 0, 0, 1)
+	ZEND_ARG_INFO(0, connection_id)
+	ZEND_ARG_INFO(0, qualifier)
+	ZEND_ARG_INFO(0, owner)
+	ZEND_ARG_INFO(0, name)
+	ZEND_ARG_INFO(0, table_types)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_columns, 0, 0, 1)
+	ZEND_ARG_INFO(0, connection_id)
+	ZEND_ARG_INFO(0, qualifier)
+	ZEND_ARG_INFO(0, owner)
+	ZEND_ARG_INFO(0, table_name)
+	ZEND_ARG_INFO(0, column_name)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_gettypeinfo, 0, 0, 1)
+	ZEND_ARG_INFO(0, connection_id)
+	ZEND_ARG_INFO(0, data_type)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_primarykeys, 0, 0, 4)
+	ZEND_ARG_INFO(0, connection_id)
+	ZEND_ARG_INFO(0, qualifier)
+	ZEND_ARG_INFO(0, owner)
+	ZEND_ARG_INFO(0, table)
+ZEND_END_ARG_INFO()
+
+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
+#if !defined(HAVE_BIRDSTEP)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedurecolumns, 0, 0, 1)
+	ZEND_ARG_INFO(0, connection_id)
+	ZEND_ARG_INFO(0, qualifier)
+	ZEND_ARG_INFO(0, owner)
+	ZEND_ARG_INFO(0, proc)
+	ZEND_ARG_INFO(0, column)
+ZEND_END_ARG_INFO()
+#endif
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedures, 0, 0, 1)
+	ZEND_ARG_INFO(0, connection_id)
+	ZEND_ARG_INFO(0, qualifier)
+	ZEND_ARG_INFO(0, owner)
+	ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_foreignkeys, 0, 0, 7)
+	ZEND_ARG_INFO(0, connection_id)
+	ZEND_ARG_INFO(0, pk_qualifier)
+	ZEND_ARG_INFO(0, pk_owner)
+	ZEND_ARG_INFO(0, pk_table)
+	ZEND_ARG_INFO(0, fk_qualifier)
+	ZEND_ARG_INFO(0, fk_owner)
+	ZEND_ARG_INFO(0, fk_table)
+ZEND_END_ARG_INFO()
+#endif
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_specialcolumns, 0, 0, 7)
+	ZEND_ARG_INFO(0, connection_id)
+	ZEND_ARG_INFO(0, type)
+	ZEND_ARG_INFO(0, qualifier)
+	ZEND_ARG_INFO(0, owner)
+	ZEND_ARG_INFO(0, table)
+	ZEND_ARG_INFO(0, scope)
+	ZEND_ARG_INFO(0, nullable)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_statistics, 0, 0, 6)
+	ZEND_ARG_INFO(0, connection_id)
+	ZEND_ARG_INFO(0, qualifier)
+	ZEND_ARG_INFO(0, owner)
+	ZEND_ARG_INFO(0, name)
+	ZEND_ARG_INFO(0, unique)
+	ZEND_ARG_INFO(0, accuracy)
+ZEND_END_ARG_INFO()
+
+#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35) && !defined(HAVE_BIRDSTEP)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_tableprivileges, 0, 0, 4)
+	ZEND_ARG_INFO(0, connection_id)
+	ZEND_ARG_INFO(0, qualifier)
+	ZEND_ARG_INFO(0, owner)
+	ZEND_ARG_INFO(0, name)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_columnprivileges, 0, 0, 5)
+	ZEND_ARG_INFO(0, connection_id)
+	ZEND_ARG_INFO(0, catalog)
+	ZEND_ARG_INFO(0, schema)
+	ZEND_ARG_INFO(0, table)
+	ZEND_ARG_INFO(0, column)
+ZEND_END_ARG_INFO()
+#endif
+/* }}} */
+
+/* {{{ odbc_functions[]
+ */
+const zend_function_entry odbc_functions[] = {
+	PHP_FE(odbc_autocommit, arginfo_odbc_autocommit)
+	PHP_FE(odbc_binmode, arginfo_odbc_binmode)
+	PHP_FE(odbc_close, arginfo_odbc_close)
+	PHP_FE(odbc_close_all, arginfo_odbc_close_all)
+	PHP_FE(odbc_columns, arginfo_odbc_columns)
+	PHP_FE(odbc_commit, arginfo_odbc_commit)
+	PHP_FE(odbc_connect, arginfo_odbc_connect)
+	PHP_FE(odbc_cursor, arginfo_odbc_cursor)
+#ifdef HAVE_SQLDATASOURCES
+	PHP_FE(odbc_data_source, arginfo_odbc_data_source)
+#endif
+	PHP_FE(odbc_execute, arginfo_odbc_execute)
+	PHP_FE(odbc_error, arginfo_odbc_error)
+	PHP_FE(odbc_errormsg, arginfo_odbc_errormsg)
+	PHP_FE(odbc_exec, arginfo_odbc_exec)
+#ifdef PHP_ODBC_HAVE_FETCH_HASH
+	PHP_FE(odbc_fetch_array, arginfo_odbc_fetch_array)
+	PHP_FE(odbc_fetch_object, arginfo_odbc_fetch_object)
+#endif
+	PHP_FE(odbc_fetch_row, arginfo_odbc_fetch_row)
+	PHP_FE(odbc_fetch_into, arginfo_odbc_fetch_into)
+	PHP_FE(odbc_field_len, arginfo_odbc_field_len)
+	PHP_FE(odbc_field_scale, arginfo_odbc_field_scale)
+	PHP_FE(odbc_field_name, arginfo_odbc_field_name)
+	PHP_FE(odbc_field_type, arginfo_odbc_field_type)
+	PHP_FE(odbc_field_num, arginfo_odbc_field_num)
+	PHP_FE(odbc_free_result, arginfo_odbc_free_result)
+	PHP_FE(odbc_gettypeinfo, arginfo_odbc_gettypeinfo)
+	PHP_FE(odbc_longreadlen, arginfo_odbc_longreadlen)
+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
+	PHP_FE(odbc_next_result, arginfo_odbc_next_result)
+#endif
+	PHP_FE(odbc_num_fields, arginfo_odbc_num_fields)
+	PHP_FE(odbc_num_rows, arginfo_odbc_num_rows)
+	PHP_FE(odbc_pconnect, arginfo_odbc_pconnect)
+	PHP_FE(odbc_prepare, arginfo_odbc_prepare)
+	PHP_FE(odbc_result, arginfo_odbc_result)
+	PHP_FE(odbc_result_all, arginfo_odbc_result_all)
+	PHP_FE(odbc_rollback, arginfo_odbc_rollback)
+	PHP_FE(odbc_setoption, arginfo_odbc_setoption)
+	PHP_FE(odbc_specialcolumns, arginfo_odbc_specialcolumns)
+	PHP_FE(odbc_statistics, arginfo_odbc_statistics)
+	PHP_FE(odbc_tables, arginfo_odbc_tables)
+	PHP_FE(odbc_primarykeys, arginfo_odbc_primarykeys)
+#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35) && !defined(HAVE_BIRDSTEP)    /* not supported now */
+	PHP_FE(odbc_columnprivileges, arginfo_odbc_columnprivileges)
+	PHP_FE(odbc_tableprivileges, arginfo_odbc_tableprivileges)
+#endif
+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) /* not supported */
+	PHP_FE(odbc_foreignkeys, arginfo_odbc_foreignkeys)
+	PHP_FE(odbc_procedures, arginfo_odbc_procedures)
+#if !defined(HAVE_BIRDSTEP)
+	PHP_FE(odbc_procedurecolumns, arginfo_odbc_procedurecolumns)
+#endif
+#endif
+	PHP_FALIAS(odbc_do, odbc_exec, arginfo_odbc_exec)
+	PHP_FALIAS(odbc_field_precision, odbc_field_len, arginfo_odbc_field_len)
+	PHP_FE_END
+};
+/* }}} */
+
+ZEND_DECLARE_MODULE_GLOBALS(odbc)
+static PHP_GINIT_FUNCTION(odbc);
+
+/* {{{ odbc_module_entry
+ */
+zend_module_entry odbc_module_entry = {
+	STANDARD_MODULE_HEADER,
+	"odbc", 
+	odbc_functions, 
+	PHP_MINIT(odbc), 
+	PHP_MSHUTDOWN(odbc),
+	PHP_RINIT(odbc), 
+	PHP_RSHUTDOWN(odbc), 
+	PHP_MINFO(odbc), 
+	"1.0",
+	PHP_MODULE_GLOBALS(odbc),
+	PHP_GINIT(odbc),
+	NULL,
+	NULL,
+	STANDARD_MODULE_PROPERTIES_EX
+};
+/* }}} */
+
+#ifdef COMPILE_DL_ODBC
+ZEND_GET_MODULE(odbc)
+#endif
+
+/* {{{ _free_odbc_result
+ */
+static void _free_odbc_result(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+{
+	odbc_result *res = (odbc_result *)rsrc->ptr;
+	int i;
+	RETCODE rc;
+	
+	if (res) {
+		if (res->values) {
+			for(i = 0; i < res->numcols; i++) {
+				if (res->values[i].value)
+					efree(res->values[i].value);
+			}
+			efree(res->values);
+			res->values = NULL;
+		}
+		if (res->stmt) {
+#if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) || defined(HAVE_SOLID_35)
+			SQLTransact(res->conn_ptr->henv, res->conn_ptr->hdbc,
+						(SQLUSMALLINT) SQL_COMMIT);
+#endif
+			rc = SQLFreeStmt(res->stmt,SQL_DROP);
+			/* We don't want the connection to be closed after the last statment has been closed
+			 * Connections will be closed on shutdown
+			 * zend_list_delete(res->conn_ptr->id);
+			 */
+		}
+		efree(res);
+	}
+}
+/* }}} */
+
+/* {{{ safe_odbc_disconnect
+ * disconnect, and if it fails, then issue a rollback for any pending transaction (lurcher)
+ */
+static void safe_odbc_disconnect( void *handle )
+{
+	int ret;
+
+	ret = SQLDisconnect( handle );
+	if ( ret == SQL_ERROR )
+	{
+		SQLTransact( NULL, handle, SQL_ROLLBACK );
+		SQLDisconnect( handle );
+	}
+}
+/* }}} */
+
+/* {{{ _close_odbc_conn
+ */
+static void _close_odbc_conn(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+{
+	int i, nument, type;
+	void *ptr;
+	odbc_result *res;
+
+	odbc_connection *conn = (odbc_connection *)rsrc->ptr;
+
+	nument = zend_hash_next_free_element(&EG(regular_list));
+	for(i = 1; i < nument; i++) {
+		ptr = zend_list_find(i, &type);
+		if (ptr && (type == le_result)) {
+			res = (odbc_result *)ptr;
+			if (res->conn_ptr == conn) {
+				zend_list_delete(i);
+			}
+		}
+	}
+
+   	safe_odbc_disconnect(conn->hdbc);
+	SQLFreeConnect(conn->hdbc);
+	SQLFreeEnv(conn->henv);
+	efree(conn);
+	ODBCG(num_links)--;
+}
+/* }}} */
+
+/* {{{ void _close_odbc_pconn
+ */
+static void _close_odbc_pconn(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+{
+	int i, nument, type;
+	void *ptr;
+	odbc_result *res;
+	odbc_connection *conn = (odbc_connection *)rsrc->ptr;
+
+	nument = zend_hash_next_free_element(&EG(persistent_list));
+	for(i = 1; i < nument; i++) {
+		ptr = zend_list_find(i, &type);
+		if (ptr && (type == le_result)) {
+			res = (odbc_result *)ptr;
+			if (res->conn_ptr == conn) {
+				zend_list_delete(i);
+			}
+		}
+	}
+	
+	safe_odbc_disconnect(conn->hdbc);
+	SQLFreeConnect(conn->hdbc);
+	SQLFreeEnv(conn->henv);
+	free(conn);
+
+	ODBCG(num_links)--;
+	ODBCG(num_persistent)--;
+}
+/* }}} */
+
+/* {{{ PHP_INI_DISP(display_link_nums)
+ */
+static PHP_INI_DISP(display_link_nums)
+{
+	char *value;
+	TSRMLS_FETCH();
+
+	if (type == PHP_INI_DISPLAY_ORIG && ini_entry->modified) {
+		value = ini_entry->orig_value;
+	} else if (ini_entry->value) {
+		value = ini_entry->value;
+	} else {
+		value = NULL;
+	}
+
+	if (value) {
+		if (atoi(value) == -1) {
+			PUTS("Unlimited");
+		} else {
+			php_printf("%s", value);
+		}
+	}
+}
+/* }}} */
+
+/* {{{ PHP_INI_DISP(display_defPW)
+ */
+static PHP_INI_DISP(display_defPW)
+{
+	char *value;
+	TSRMLS_FETCH();
+
+	if (type == PHP_INI_DISPLAY_ORIG && ini_entry->modified) {
+		value = ini_entry->orig_value;
+	} else if (ini_entry->value) {
+		value = ini_entry->value;
+	} else {
+		value = NULL;
+	}
+
+	if (value) {
+#if PHP_DEBUG
+		php_printf("%s", value);
+#else
+		PUTS("********");
+#endif
+	} else {
+		if (PG(html_errors)) {
+			PUTS("<i>no value</i>");
+		} else {
+			PUTS("no value");
+		}
+	}
+}
+/* }}} */
+
+/* {{{ PHP_INI_DISP(display_binmode)
+ */
+static PHP_INI_DISP(display_binmode)
+{
+	char *value;
+	TSRMLS_FETCH();
+	
+	if (type == PHP_INI_DISPLAY_ORIG && ini_entry->modified) {
+		value = ini_entry->orig_value;
+	} else if (ini_entry->value) {
+		value = ini_entry->value;
+	} else {
+		value = NULL;
+	}
+
+	if (value) {
+		switch(atoi(value)) {
+			case 0:
+				PUTS("passthru");
+				break;
+			case 1:
+				PUTS("return as is");
+				break;
+			case 2:
+				PUTS("return as char");
+				break;
+		}
+	}
+}
+/* }}} */
+
+/* {{{ PHP_INI_DISP(display_lrl)
+ */
+static PHP_INI_DISP(display_lrl)
+{
+	char *value;
+	TSRMLS_FETCH();
+
+	if (type == PHP_INI_DISPLAY_ORIG && ini_entry->modified) {
+		value = ini_entry->orig_value;
+	} else if (ini_entry->value) {
+		value = ini_entry->value;
+	} else {
+		value = NULL;
+	}
+
+	if (value) {
+		if (atoi(value) <= 0) {
+			PUTS("Passthru");
+		} else {
+			php_printf("return up to %s bytes", value);
+		}
+	}
+}
+/* }}} */
+
+
+/* {{{ PHP_INI_DISP(display_cursortype)
+ */
+static PHP_INI_DISP(display_cursortype)
+{
+	char *value;
+	TSRMLS_FETCH();
+
+	if (type == PHP_INI_DISPLAY_ORIG && ini_entry->modified) {
+		value = ini_entry->orig_value;
+	} else if (ini_entry->value) {
+		value = ini_entry->value;
+	} else {
+		value = NULL;
+	}
+
+	if (value) {
+		switch (atoi (value))
+		  {
+		    case SQL_CURSOR_FORWARD_ONLY:
+				PUTS ("Forward Only cursor");
+				break;
+
+			case SQL_CURSOR_STATIC:
+			    PUTS ("Static cursor");
+				break;
+
+			case SQL_CURSOR_KEYSET_DRIVEN:
+				PUTS ("Keyset driven cursor");
+				break;
+
+			case SQL_CURSOR_DYNAMIC:
+				PUTS ("Dynamic cursor");
+				break;
+
+			default:
+				php_printf("Unknown cursor model %s", value);
+				break;
+		  }
+	}
+}
+
+/* }}} */
+
+/* {{{ PHP_INI_BEGIN 
+ */
+PHP_INI_BEGIN()
+	STD_PHP_INI_BOOLEAN("odbc.allow_persistent", "1", PHP_INI_SYSTEM, OnUpdateLong,
+			allow_persistent, zend_odbc_globals, odbc_globals)
+	STD_PHP_INI_ENTRY_EX("odbc.max_persistent",  "-1", PHP_INI_SYSTEM, OnUpdateLong,
+			max_persistent, zend_odbc_globals, odbc_globals, display_link_nums)
+	STD_PHP_INI_ENTRY_EX("odbc.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong,
+			max_links, zend_odbc_globals, odbc_globals, display_link_nums)
+	STD_PHP_INI_ENTRY("odbc.default_db", NULL, PHP_INI_ALL, OnUpdateString,
+			defDB, zend_odbc_globals, odbc_globals)
+	STD_PHP_INI_ENTRY("odbc.default_user", NULL, PHP_INI_ALL, OnUpdateString,
+			defUser, zend_odbc_globals, odbc_globals)
+	STD_PHP_INI_ENTRY_EX("odbc.default_pw", NULL, PHP_INI_ALL, OnUpdateString,
+			defPW, zend_odbc_globals, odbc_globals, display_defPW)
+	STD_PHP_INI_ENTRY_EX("odbc.defaultlrl", "4096", PHP_INI_ALL, OnUpdateLong,
+			defaultlrl, zend_odbc_globals, odbc_globals, display_lrl)
+	STD_PHP_INI_ENTRY_EX("odbc.defaultbinmode", "1", PHP_INI_ALL, OnUpdateLong,
+			defaultbinmode, zend_odbc_globals, odbc_globals, display_binmode)
+	STD_PHP_INI_BOOLEAN("odbc.check_persistent", "1", PHP_INI_SYSTEM, OnUpdateLong,
+			check_persistent, zend_odbc_globals, odbc_globals)
+	STD_PHP_INI_ENTRY_EX("odbc.default_cursortype", "3", PHP_INI_ALL, OnUpdateLong, 
+			default_cursortype, zend_odbc_globals, odbc_globals, display_cursortype)
+PHP_INI_END()
+/* }}} */
+
+static PHP_GINIT_FUNCTION(odbc)
+{
+	odbc_globals->num_persistent = 0;
+}
+
+/* {{{ PHP_MINIT_FUNCTION */
+PHP_MINIT_FUNCTION(odbc)
+{
+#ifdef SQLANY_BUG
+	ODBC_SQL_CONN_T foobar;
+	RETCODE rc;
+#endif
+
+	REGISTER_INI_ENTRIES();
+	le_result = zend_register_list_destructors_ex(_free_odbc_result, NULL, "odbc result", module_number);
+	le_conn = zend_register_list_destructors_ex(_close_odbc_conn, NULL, "odbc link", module_number);
+	le_pconn = zend_register_list_destructors_ex(NULL, _close_odbc_pconn, "odbc link persistent", module_number);
+	Z_TYPE(odbc_module_entry) = type;
+	
+	REGISTER_STRING_CONSTANT("ODBC_TYPE", PHP_ODBC_TYPE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("ODBC_BINMODE_PASSTHRU", 0, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("ODBC_BINMODE_RETURN", 1, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("ODBC_BINMODE_CONVERT", 2, CONST_CS | CONST_PERSISTENT);
+	/* Define Constants for options
+	   these Constants are defined in <sqlext.h>
+	*/
+	REGISTER_LONG_CONSTANT("SQL_ODBC_CURSORS", SQL_ODBC_CURSORS, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_CUR_USE_DRIVER", SQL_CUR_USE_DRIVER, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_CUR_USE_IF_NEEDED", SQL_CUR_USE_IF_NEEDED, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_CUR_USE_ODBC", SQL_CUR_USE_ODBC, CONST_PERSISTENT | CONST_CS);
+
+
+	REGISTER_LONG_CONSTANT("SQL_CONCURRENCY", SQL_CONCURRENCY, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_CONCUR_READ_ONLY", SQL_CONCUR_READ_ONLY, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_CONCUR_LOCK", SQL_CONCUR_LOCK, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_CONCUR_ROWVER", SQL_CONCUR_ROWVER, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_CONCUR_VALUES", SQL_CONCUR_VALUES, CONST_PERSISTENT | CONST_CS);
+
+	REGISTER_LONG_CONSTANT("SQL_CURSOR_TYPE", SQL_CURSOR_TYPE, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_CURSOR_FORWARD_ONLY", SQL_CURSOR_FORWARD_ONLY, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_CURSOR_KEYSET_DRIVEN", SQL_CURSOR_KEYSET_DRIVEN, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_CURSOR_DYNAMIC", SQL_CURSOR_DYNAMIC, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_CURSOR_STATIC", SQL_CURSOR_STATIC, CONST_PERSISTENT | CONST_CS);
+	
+	REGISTER_LONG_CONSTANT("SQL_KEYSET_SIZE", SQL_KEYSET_SIZE, CONST_PERSISTENT | CONST_CS);
+
+	/* these are for the Data Source type */
+	REGISTER_LONG_CONSTANT("SQL_FETCH_FIRST", SQL_FETCH_FIRST, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_FETCH_NEXT", SQL_FETCH_NEXT, CONST_PERSISTENT | CONST_CS);
+
+	/*
+	 * register the standard data types
+	 */
+	REGISTER_LONG_CONSTANT("SQL_CHAR", SQL_CHAR, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_VARCHAR", SQL_VARCHAR, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_LONGVARCHAR", SQL_LONGVARCHAR, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_DECIMAL", SQL_DECIMAL, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_NUMERIC", SQL_NUMERIC, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_BIT", SQL_BIT, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_TINYINT", SQL_TINYINT, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_SMALLINT", SQL_SMALLINT, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_INTEGER", SQL_INTEGER, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_BIGINT", SQL_BIGINT, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_REAL", SQL_REAL, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_FLOAT", SQL_FLOAT, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_DOUBLE", SQL_DOUBLE, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_BINARY", SQL_BINARY, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_VARBINARY", SQL_VARBINARY, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_LONGVARBINARY", SQL_LONGVARBINARY, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_DATE", SQL_DATE, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_TIME", SQL_TIME, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_TIMESTAMP", SQL_TIMESTAMP, CONST_PERSISTENT | CONST_CS);
+#if defined(ODBCVER) && (ODBCVER >= 0x0300)
+	REGISTER_LONG_CONSTANT("SQL_TYPE_DATE", SQL_TYPE_DATE, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_TYPE_TIME", SQL_TYPE_TIME, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_TYPE_TIMESTAMP", SQL_TYPE_TIMESTAMP, CONST_PERSISTENT | CONST_CS);
+
+	/*
+	 * SQLSpecialColumns values
+	 */
+	REGISTER_LONG_CONSTANT("SQL_BEST_ROWID", SQL_BEST_ROWID, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_ROWVER", SQL_ROWVER, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_SCOPE_CURROW", SQL_SCOPE_CURROW, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_SCOPE_TRANSACTION", SQL_SCOPE_TRANSACTION, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_SCOPE_SESSION", SQL_SCOPE_SESSION, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_NO_NULLS", SQL_NO_NULLS, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_NULLABLE", SQL_NULLABLE, CONST_PERSISTENT | CONST_CS);
+
+	/*
+	 * SQLStatistics values
+	 */
+	REGISTER_LONG_CONSTANT("SQL_INDEX_UNIQUE", SQL_INDEX_UNIQUE, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_INDEX_ALL", SQL_INDEX_ALL, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_ENSURE", SQL_ENSURE, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("SQL_QUICK", SQL_QUICK, CONST_PERSISTENT | CONST_CS);
+#endif
+
+#if defined(HAVE_IBMDB2) && defined(_AIX)
+	/* atexit() handler in the DB2/AIX library segfaults in PHP CLI */
+	/* DB2NOEXITLIST env variable prevents DB2 from invoking atexit() */
+	putenv("DB2NOEXITLIST=TRUE");
+#endif
+
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_RINIT_FUNCTION */
+PHP_RINIT_FUNCTION(odbc)
+{
+	ODBCG(defConn) = -1;
+	ODBCG(num_links) = ODBCG(num_persistent);
+	memset(ODBCG(laststate), '\0', 6);
+	memset(ODBCG(lasterrormsg), '\0', SQL_MAX_MESSAGE_LENGTH);
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_RSHUTDOWN_FUNCTION */
+PHP_RSHUTDOWN_FUNCTION(odbc)
+{
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_MSHUTDOWN_FUNCTION */
+PHP_MSHUTDOWN_FUNCTION(odbc)
+{
+	UNREGISTER_INI_ENTRIES();
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_MINFO_FUNCTION */
+PHP_MINFO_FUNCTION(odbc)
+{
+	char buf[32];
+
+	php_info_print_table_start();
+	php_info_print_table_header(2, "ODBC Support", "enabled");
+	snprintf(buf, sizeof(buf), "%ld", ODBCG(num_persistent));
+	php_info_print_table_row(2, "Active Persistent Links", buf);
+	snprintf(buf, sizeof(buf), "%ld", ODBCG(num_links));
+	php_info_print_table_row(2, "Active Links", buf);
+	php_info_print_table_row(2, "ODBC library", PHP_ODBC_TYPE);
+#ifndef PHP_WIN32
+	php_info_print_table_row(2, "ODBC_INCLUDE", PHP_ODBC_INCLUDE);
+	php_info_print_table_row(2, "ODBC_LFLAGS", PHP_ODBC_LFLAGS);
+	php_info_print_table_row(2, "ODBC_LIBS", PHP_ODBC_LIBS);
+#endif
+	php_info_print_table_end();
+
+	DISPLAY_INI_ENTRIES();
+
+}	 
+/* }}} */
+
+/* {{{ odbc_sql_error */
+void odbc_sql_error(ODBC_SQL_ERROR_PARAMS)
+{
+	char   	    state[6];
+	SQLINTEGER	error;        /* Not used */
+	char   	    errormsg[SQL_MAX_MESSAGE_LENGTH];
+	SQLSMALLINT	errormsgsize; /* Not used */
+	RETCODE rc;
+	ODBC_SQL_ENV_T henv;
+	ODBC_SQL_CONN_T conn;
+	TSRMLS_FETCH();
+
+	if (conn_resource) {
+		henv = conn_resource->henv;
+		conn = conn_resource->hdbc;
+	} else {
+		henv = SQL_NULL_HENV;
+		conn = SQL_NULL_HDBC;
+	}
+
+	/* This leads to an endless loop in many drivers! 
+	 *
+	   while(henv != SQL_NULL_HENV){
+		do {
+	 */
+	rc = SQLError(henv, conn, stmt, state, &error, errormsg, sizeof(errormsg)-1, &errormsgsize);
+	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
+		snprintf(state, sizeof(state), "HY000");
+		snprintf(errormsg, sizeof(errormsg), "Failed to fetch error message");
+	}
+	if (conn_resource) {
+		memcpy(conn_resource->laststate, state, sizeof(state));
+		memcpy(conn_resource->lasterrormsg, errormsg, sizeof(errormsg));
+	}
+	memcpy(ODBCG(laststate), state, sizeof(state));
+	memcpy(ODBCG(lasterrormsg), errormsg, sizeof(errormsg));
+	if (func) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQL error: %s, SQL state %s in %s", errormsg, state, func);
+	} else {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQL error: %s, SQL state %s", errormsg, state);
+	}
+	/*		
+		} while (SQL_SUCCEEDED(rc));
+	}
+	*/
+}
+/* }}} */
+
+/* {{{ php_odbc_fetch_attribs */
+void php_odbc_fetch_attribs(INTERNAL_FUNCTION_PARAMETERS, int mode)
+{
+	odbc_result *result;
+	zval *pv_res;
+	long flag;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &pv_res, &flag) == FAILURE) {
+		return;
+	}
+	
+	if (Z_LVAL_P(pv_res)) {
+		ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
+        if (mode) {
+            result->longreadlen = flag;
+        } else {
+            result->binmode = flag;
+		}
+	} else {
+        if (mode) {
+            ODBCG(defaultlrl) = flag;
+        } else {
+            ODBCG(defaultbinmode) = flag;
+		}
+	}
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ odbc_bindcols */
+int odbc_bindcols(odbc_result *result TSRMLS_DC)
+{
+	RETCODE rc;
+	int i;
+	SQLSMALLINT colnamelen; /* Not used */
+	SQLLEN      displaysize;
+
+	result->values = (odbc_result_value *) safe_emalloc(sizeof(odbc_result_value), result->numcols, 0);
+
+	result->longreadlen = ODBCG(defaultlrl);
+	result->binmode = ODBCG(defaultbinmode);
+
+	for(i = 0; i < result->numcols; i++) {
+		rc = SQLColAttributes(result->stmt, (SQLUSMALLINT)(i+1), SQL_COLUMN_NAME, 
+				result->values[i].name, sizeof(result->values[i].name), &colnamelen, 0);
+		rc = SQLColAttributes(result->stmt, (SQLUSMALLINT)(i+1), SQL_COLUMN_TYPE, 
+				NULL, 0, NULL, &result->values[i].coltype);
+		
+		/* Don't bind LONG / BINARY columns, so that fetch behaviour can
+		 * be controlled by odbc_binmode() / odbc_longreadlen()
+		 */
+		
+		switch(result->values[i].coltype) {
+			case SQL_BINARY:
+			case SQL_VARBINARY:
+			case SQL_LONGVARBINARY:
+			case SQL_LONGVARCHAR:
+				result->values[i].value = NULL;
+				break;
+				
+#ifdef HAVE_ADABAS
+			case SQL_TIMESTAMP:
+				result->values[i].value = (char *)emalloc(27);
+				SQLBindCol(result->stmt, (SQLUSMALLINT)(i+1), SQL_C_CHAR, result->values[i].value,
+							27, &result->values[i].vallen);
+				break;
+#endif /* HAVE_ADABAS */
+			default:
+				rc = SQLColAttributes(result->stmt, (SQLUSMALLINT)(i+1), SQL_COLUMN_DISPLAY_SIZE,
+									NULL, 0, NULL, &displaysize);
+				displaysize = displaysize <= result->longreadlen ? displaysize : 
+								result->longreadlen;
+				/* Workaround for Oracle ODBC Driver bug (#50162) when fetching TIMESTAMP column */
+				if (result->values[i].coltype == SQL_TIMESTAMP) {
+					displaysize += 3;
+				}
+				result->values[i].value = (char *)emalloc(displaysize + 1);
+				rc = SQLBindCol(result->stmt, (SQLUSMALLINT)(i+1), SQL_C_CHAR, result->values[i].value,
+							displaysize + 1, &result->values[i].vallen);
+				break;
+		}
+	}
+	return 1;
+}
+/* }}} */
+
+/* {{{ odbc_transact */
+void odbc_transact(INTERNAL_FUNCTION_PARAMETERS, int type)
+{
+	odbc_connection *conn;
+	RETCODE rc;
+	zval *pv_conn;
+	
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pv_conn) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
+	
+	rc = SQLTransact(conn->henv, conn->hdbc, (SQLUSMALLINT)((type)?SQL_COMMIT:SQL_ROLLBACK));
+	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLTransact");
+		RETURN_FALSE;
+	}
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ _close_pconn_with_id */
+static int _close_pconn_with_id(zend_rsrc_list_entry *le, int *id TSRMLS_DC)
+{
+	if(Z_TYPE_P(le) == le_pconn && (((odbc_connection *)(le->ptr))->id == *id)){
+		return 1;
+	}else{
+		return 0;
+	}
+}
+/* }}} */
+
+/* {{{ odbc_column_lengths */
+void odbc_column_lengths(INTERNAL_FUNCTION_PARAMETERS, int type)
+{
+	odbc_result *result;
+#if defined(HAVE_SOLID) || defined(HAVE_SOLID_30)
+	/* this seems to be necessary for Solid2.3 ( tested by 
+	 * tammy@synchronis.com) and Solid 3.0 (tested by eric@terra.telemediair.nl)
+	 * Solid does not seem to declare a SQLINTEGER, but it does declare a
+	 * SQL_INTEGER which does not work (despite being the same type as a SDWORD.
+	 * Solid 3.5 does not have this issue.
+	 */
+	SDWORD len;
+#else
+	SQLLEN len;
+#endif
+	zval *pv_res;
+	long pv_num;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &pv_res, &pv_num) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
+
+	if (result->numcols == 0) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
+		RETURN_FALSE;
+	}
+
+	if (pv_num > result->numcols) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field index larger than number of fields");
+		RETURN_FALSE;
+	}
+
+	if (pv_num < 1) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field numbering starts at 1");
+		RETURN_FALSE;
+	}
+
+	SQLColAttributes(result->stmt, (SQLUSMALLINT)pv_num, (SQLUSMALLINT) (type?SQL_COLUMN_SCALE:SQL_COLUMN_PRECISION), NULL, 0, NULL, &len);
+
+	RETURN_LONG(len);
+}
+/* }}} */
+
+/* Main User Functions */
+
+/* {{{ proto void odbc_close_all(void)
+   Close all ODBC connections */
+PHP_FUNCTION(odbc_close_all)
+{
+	void *ptr;
+	int type;
+	int i;
+	int nument;
+
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
+
+	nument = zend_hash_next_free_element(&EG(regular_list));
+	
+	/* Loop through list and close all statements */
+	for(i = 1; i < nument; i++) {
+		ptr = zend_list_find(i, &type);
+		if (ptr && (type == le_result)){
+			zend_list_delete(i);
+		}
+	}
+
+	/* Second loop through list, now close all connections */
+	nument = zend_hash_next_free_element(&EG(regular_list));
+	
+	for(i = 1; i < nument; i++) {
+		ptr = zend_list_find(i, &type);
+		if (ptr){
+			if(type == le_conn){
+				zend_list_delete(i);
+			}else if(type == le_pconn){
+				zend_list_delete(i);
+				/* Delete the persistent connection */
+				zend_hash_apply_with_argument(&EG(persistent_list), 
+					(apply_func_arg_t) _close_pconn_with_id, (void *) &i TSRMLS_CC);
+			}
+		}
+	}
+}
+/* }}} */
+
+/* {{{ proto bool odbc_binmode(int result_id, int mode)
+   Handle binary column data */
+PHP_FUNCTION(odbc_binmode)
+{
+	php_odbc_fetch_attribs(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+}
+/* }}} */
+
+/* {{{ proto bool odbc_longreadlen(int result_id, int length)
+   Handle LONG columns */
+PHP_FUNCTION(odbc_longreadlen)
+{
+	php_odbc_fetch_attribs(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
+}
+/* }}} */
+
+/* {{{ proto resource odbc_prepare(resource connection_id, string query)
+   Prepares a statement for execution */
+PHP_FUNCTION(odbc_prepare)
+{
+	zval *pv_conn;
+	char *query;
+	int query_len;
+	odbc_result *result = NULL;
+	odbc_connection *conn;
+	RETCODE rc;
+#ifdef HAVE_SQL_EXTENDED_FETCH
+	SQLUINTEGER      scrollopts;
+#endif
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &pv_conn, &query, &query_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
+
+	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
+	
+	result->numparams = 0;
+	
+	rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+	if (rc == SQL_INVALID_HANDLE) {
+		efree(result);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
+		RETURN_FALSE;
+	}
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLAllocStmt");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+#ifdef HAVE_SQL_EXTENDED_FETCH
+	/* Solid doesn't have ExtendedFetch, if DriverManager is used, get Info,
+	   whether Driver supports ExtendedFetch */
+	rc = SQLGetInfo(conn->hdbc, SQL_FETCH_DIRECTION, (void *) &scrollopts, sizeof(scrollopts), NULL);
+	if (rc == SQL_SUCCESS) {
+		if ((result->fetch_abs = (scrollopts & SQL_FD_FETCH_ABSOLUTE))) {
+			/* Try to set CURSOR_TYPE to dynamic. Driver will replace this with other
+			   type if not possible.
+			*/
+			SQLSetStmtOption(result->stmt, SQL_CURSOR_TYPE, ODBCG(default_cursortype));
+		}
+	} else {
+		result->fetch_abs = 0;
+	}
+#endif
+
+	rc = SQLPrepare(result->stmt, query, SQL_NTS);
+	switch (rc) {
+		case SQL_SUCCESS:
+			break;
+		case SQL_SUCCESS_WITH_INFO:
+			odbc_sql_error(conn, result->stmt, "SQLPrepare");
+			break;
+		default:
+			odbc_sql_error(conn, result->stmt, "SQLPrepare");
+			RETURN_FALSE;
+	}
+	
+	SQLNumParams(result->stmt, &(result->numparams));
+	SQLNumResultCols(result->stmt, &(result->numcols));
+
+	if (result->numcols > 0) {
+		if (!odbc_bindcols(result TSRMLS_CC)) {
+			efree(result);
+			RETURN_FALSE;
+		}
+	} else {
+		result->values = NULL;
+	}
+	zend_list_addref(conn->id);
+	result->conn_ptr = conn;
+	result->fetched = 0;
+	ZEND_REGISTER_RESOURCE(return_value, result, le_result);  
+}
+/* }}} */
+
+/*
+ * Execute prepared SQL statement. Supports only input parameters.
+ */
+
+/* {{{ proto bool odbc_execute(resource result_id [, array parameters_array])
+   Execute a prepared statement */
+PHP_FUNCTION(odbc_execute)
+{ 
+	zval *pv_res, *pv_param_arr, **tmp;
+	typedef struct params_t {
+		SQLLEN vallen;
+		int fp;
+	} params_t;
+	params_t *params = NULL;
+	char *filename;
+	unsigned char otype;
+   	SQLSMALLINT sqltype, ctype, scale;
+	SQLSMALLINT nullable;
+	SQLULEN precision;
+   	odbc_result *result;
+	int numArgs, i, ne;
+	RETCODE rc;
+	
+	numArgs = ZEND_NUM_ARGS();
+	
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|a", &pv_res, &pv_param_arr) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
+	
+	/* XXX check for already bound parameters*/
+	if (result->numparams > 0 && numArgs == 1) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No parameters to SQL statement given");
+		RETURN_FALSE;
+	}
+
+	if (result->numparams > 0) {
+		if ((ne = zend_hash_num_elements(Z_ARRVAL_P(pv_param_arr))) < result->numparams) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING,"Not enough parameters (%d should be %d) given", ne, result->numparams);
+			RETURN_FALSE;
+		}
+
+		zend_hash_internal_pointer_reset(Z_ARRVAL_P(pv_param_arr));
+		params = (params_t *)safe_emalloc(sizeof(params_t), result->numparams, 0);
+		for(i = 0; i < result->numparams; i++) {
+			params[i].fp = -1;
+		}
+		
+		for(i = 1; i <= result->numparams; i++) {
+			if (zend_hash_get_current_data(Z_ARRVAL_P(pv_param_arr), (void **) &tmp) == FAILURE) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING,"Error getting parameter");
+				SQLFreeStmt(result->stmt,SQL_RESET_PARAMS);
+				for (i = 0; i < result->numparams; i++) {
+					if (params[i].fp != -1) {
+						close(params[i].fp);
+					}
+				}
+				efree(params);
+				RETURN_FALSE;
+			}
+
+			otype = (*tmp)->type;
+			convert_to_string_ex(tmp);
+			if (Z_TYPE_PP(tmp) != IS_STRING) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING,"Error converting parameter");
+				SQLFreeStmt(result->stmt, SQL_RESET_PARAMS);
+				for (i = 0; i < result->numparams; i++) {
+					if (params[i].fp != -1) {
+						close(params[i].fp);
+					}
+				}
+				efree(params);
+				RETURN_FALSE;
+			}
+			
+			rc = SQLDescribeParam(result->stmt, (SQLUSMALLINT)i, &sqltype, &precision, &scale, &nullable);
+			params[i-1].vallen = Z_STRLEN_PP(tmp);
+			params[i-1].fp = -1;
+			if (rc == SQL_ERROR) {
+				odbc_sql_error(result->conn_ptr, result->stmt, "SQLDescribeParameter");	
+				SQLFreeStmt(result->stmt, SQL_RESET_PARAMS);
+				for (i = 0; i < result->numparams; i++) {
+					if (params[i].fp != -1) {
+						close(params[i].fp);
+					}
+				}
+				efree(params);
+				RETURN_FALSE;
+			}
+
+			if (IS_SQL_BINARY(sqltype)) {
+				ctype = SQL_C_BINARY;
+			} else {
+				ctype = SQL_C_CHAR;
+			}
+
+			if (Z_STRLEN_PP(tmp) > 2 &&
+				Z_STRVAL_PP(tmp)[0] == '\'' &&
+				Z_STRVAL_PP(tmp)[Z_STRLEN_PP(tmp) - 1] == '\'') {
+					
+				if (CHECK_ZVAL_NULL_PATH(*tmp)) {
+					RETURN_FALSE;
+				}
+				filename = estrndup(&Z_STRVAL_PP(tmp)[1], Z_STRLEN_PP(tmp) - 2);
+				filename[strlen(filename)] = '\0';
+
+				/* Check the basedir */
+				if (php_check_open_basedir(filename TSRMLS_CC)) {
+					efree(filename);
+					SQLFreeStmt(result->stmt, SQL_RESET_PARAMS);
+					for (i = 0; i < result->numparams; i++) {
+						if (params[i].fp != -1) {
+							close(params[i].fp);
+						}
+					}
+					efree(params);
+					RETURN_FALSE;
+				}
+
+				if ((params[i-1].fp = open(filename,O_RDONLY)) == -1) {
+					php_error_docref(NULL TSRMLS_CC, E_WARNING,"Can't open file %s", filename);
+					SQLFreeStmt(result->stmt, SQL_RESET_PARAMS);
+					for (i = 0; i < result->numparams; i++) {
+						if (params[i].fp != -1) {
+							close(params[i].fp);
+						}
+					}
+					efree(params);
+					efree(filename);
+					RETURN_FALSE;
+				}
+
+				efree(filename);
+
+				params[i-1].vallen = SQL_LEN_DATA_AT_EXEC(0);
+
+				rc = SQLBindParameter(result->stmt, (SQLUSMALLINT)i, SQL_PARAM_INPUT,
+									  ctype, sqltype, precision, scale,
+									  (void *)params[i-1].fp, 0,
+									  &params[i-1].vallen);
+			} else {
+#ifdef HAVE_DBMAKER
+				precision = params[i-1].vallen;
+#endif
+				if (otype == IS_NULL) {
+					params[i-1].vallen = SQL_NULL_DATA;
+				}
+
+				rc = SQLBindParameter(result->stmt, (SQLUSMALLINT)i, SQL_PARAM_INPUT,
+									  ctype, sqltype, precision, scale,
+									  Z_STRVAL_PP(tmp), 0,
+									  &params[i-1].vallen);
+			}
+			if (rc == SQL_ERROR) {
+				odbc_sql_error(result->conn_ptr, result->stmt, "SQLBindParameter");	
+				SQLFreeStmt(result->stmt, SQL_RESET_PARAMS);
+				for (i = 0; i < result->numparams; i++) {
+					if (params[i].fp != -1) {
+						close(params[i].fp);
+					}
+				}
+				efree(params);
+				RETURN_FALSE;
+			}
+			zend_hash_move_forward(Z_ARRVAL_P(pv_param_arr));
+		}
+	}
+	/* Close cursor, needed for doing multiple selects */
+	rc = SQLFreeStmt(result->stmt, SQL_CLOSE);
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(result->conn_ptr, result->stmt, "SQLFreeStmt");	
+	}
+
+	rc = SQLExecute(result->stmt);
+
+	result->fetched = 0;
+	if (rc == SQL_NEED_DATA) {
+		char buf[4096];
+		int fp, nbytes;
+		while (rc == SQL_NEED_DATA) {
+			rc = SQLParamData(result->stmt, (void*)&fp);
+			if (rc == SQL_NEED_DATA) {
+				while ((nbytes = read(fp, &buf, 4096)) > 0) {
+					SQLPutData(result->stmt, (void*)&buf, nbytes);
+				}
+			}
+		}
+	} else {
+		switch (rc) {
+			case SQL_SUCCESS:
+				break;
+			case SQL_NO_DATA_FOUND:
+			case SQL_SUCCESS_WITH_INFO:
+				odbc_sql_error(result->conn_ptr, result->stmt, "SQLExecute");
+				break;
+			default:
+				odbc_sql_error(result->conn_ptr, result->stmt, "SQLExecute");
+				RETVAL_FALSE;
+		}
+	}	
+	
+	if (result->numparams > 0) {
+		SQLFreeStmt(result->stmt, SQL_RESET_PARAMS);
+		for(i = 0; i < result->numparams; i++) {
+			if (params[i].fp != -1) {
+				close(params[i].fp);
+			}
+		}
+		efree(params);
+	}
+
+	if (rc == SQL_SUCCESS || rc == SQL_SUCCESS_WITH_INFO || rc == SQL_NO_DATA_FOUND) {
+		RETVAL_TRUE;
+	}
+
+	if (result->numcols == 0) {
+		SQLNumResultCols(result->stmt, &(result->numcols));
+
+		if (result->numcols > 0) {
+			if (!odbc_bindcols(result TSRMLS_CC)) {
+				efree(result);
+				RETVAL_FALSE;
+			}
+		} else {
+			result->values = NULL;
+		}
+	}
+}
+/* }}} */
+
+/* {{{ proto string odbc_cursor(resource result_id)
+   Get cursor name */
+PHP_FUNCTION(odbc_cursor)
+{
+	zval *pv_res;
+	SQLUSMALLINT max_len;
+	SQLSMALLINT len;
+	char *cursorname;
+   	odbc_result *result;
+	RETCODE rc;
+	
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pv_res) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
+
+	rc = SQLGetInfo(result->conn_ptr->hdbc,SQL_MAX_CURSOR_NAME_LEN, (void *)&max_len,sizeof(max_len),&len);
+	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
+		RETURN_FALSE;
+	}
+	
+	if (max_len > 0) {
+		cursorname = emalloc(max_len + 1);
+		rc = SQLGetCursorName(result->stmt,cursorname,(SQLSMALLINT)max_len,&len);
+		if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
+			char        state[6];     /* Not used */
+	 		SQLINTEGER  error;        /* Not used */
+			char        errormsg[SQL_MAX_MESSAGE_LENGTH];
+			SQLSMALLINT errormsgsize; /* Not used */
+
+			SQLError( result->conn_ptr->henv, result->conn_ptr->hdbc,
+						result->stmt, state, &error, errormsg,
+						sizeof(errormsg)-1, &errormsgsize);
+			if (!strncmp(state,"S1015",5)) {
+				snprintf(cursorname, max_len+1, "php_curs_%d", (int)result->stmt);
+				if (SQLSetCursorName(result->stmt,cursorname,SQL_NTS) != SQL_SUCCESS) {
+					odbc_sql_error(result->conn_ptr, result->stmt, "SQLSetCursorName");
+					RETVAL_FALSE;
+				} else {
+					RETVAL_STRING(cursorname,1);
+				}
+			} else {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQL error: %s, SQL state %s", errormsg, state);
+				RETVAL_FALSE;
+			}
+		} else {
+			RETVAL_STRING(cursorname,1);
+		}
+		efree(cursorname);
+	} else {
+		RETVAL_FALSE;
+	}
+}
+/* }}} */
+
+#ifdef HAVE_SQLDATASOURCES
+/* {{{ proto array odbc_data_source(resource connection_id, int fetch_type)
+   Return information about the currently connected data source */
+PHP_FUNCTION(odbc_data_source)
+{
+	zval *zv_conn;
+	long zv_fetch_type;
+	RETCODE rc = 0; /* assume all is good */
+	odbc_connection *conn;
+	UCHAR server_name[100], desc[200];
+	SQLSMALLINT len1=0, len2=0, fetch_type;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zv_conn, &zv_fetch_type) == FAILURE) {
+		return;
+	}
+
+	fetch_type = (SQLSMALLINT) zv_fetch_type;
+
+	if (!(fetch_type == SQL_FETCH_FIRST || fetch_type == SQL_FETCH_NEXT)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid fetch type (%d)", fetch_type);
+		RETURN_FALSE;
+	}
+
+	ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &zv_conn, -1, "ODBC-Link", le_conn, le_pconn);
+
+	/* now we have the "connection" lets call the DataSource object */
+	rc = SQLDataSources(conn->henv, 
+			fetch_type,
+			server_name,
+			(SQLSMALLINT)sizeof(server_name),
+			&len1,
+			desc, 
+			(SQLSMALLINT)sizeof(desc),
+			&len2);
+
+	if (rc != SQL_SUCCESS) {
+		/* ummm.... he did it */
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLDataSources");
+		RETURN_FALSE;
+	}
+
+	if (len1 == 0 || len2 == 0) {
+		/* we have a non-valid entry... so stop the looping */
+		RETURN_FALSE;
+	}
+
+	array_init(return_value);
+
+	add_assoc_string_ex(return_value, "server", sizeof("server"), server_name, 1);
+	add_assoc_string_ex(return_value, "description", sizeof("description"), desc, 1);
+
+}
+/* }}} */
+#endif /* HAVE_SQLDATASOURCES */
+
+/* {{{ proto resource odbc_exec(resource connection_id, string query [, int flags])
+   Prepare and execute an SQL statement */
+/* XXX Use flags */
+PHP_FUNCTION(odbc_exec)
+{
+	zval *pv_conn;
+	long pv_flags;
+	char *query;
+	int numArgs, query_len;
+	odbc_result *result = NULL;
+	odbc_connection *conn;
+	RETCODE rc;
+#ifdef HAVE_SQL_EXTENDED_FETCH
+	SQLUINTEGER      scrollopts;
+#endif
+
+	numArgs = ZEND_NUM_ARGS();
+	
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &pv_conn, &query, &query_len, &pv_flags) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
+		
+	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
+
+	rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+	if (rc == SQL_INVALID_HANDLE) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLAllocStmt");
+		efree(result);
+		RETURN_FALSE;
+	}
+	
+#ifdef HAVE_SQL_EXTENDED_FETCH
+	/* Solid doesn't have ExtendedFetch, if DriverManager is used, get Info,
+	   whether Driver supports ExtendedFetch */
+	rc = SQLGetInfo(conn->hdbc, SQL_FETCH_DIRECTION, (void *) &scrollopts, sizeof(scrollopts), NULL);
+	if (rc == SQL_SUCCESS) {
+		if ((result->fetch_abs = (scrollopts & SQL_FD_FETCH_ABSOLUTE))) {
+			/* Try to set CURSOR_TYPE to dynamic. Driver will replace this with other
+			   type if not possible.
+			 */
+			SQLSetStmtOption(result->stmt, SQL_CURSOR_TYPE, ODBCG(default_cursortype));
+		}
+	} else {
+		result->fetch_abs = 0;
+	}
+#endif
+
+	rc = SQLExecDirect(result->stmt, query, SQL_NTS);
+	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO && rc != SQL_NO_DATA_FOUND) { 
+		/* XXX FIXME we should really check out SQLSTATE with SQLError
+		 * in case rc is SQL_SUCCESS_WITH_INFO here.
+		 */
+		odbc_sql_error(conn, result->stmt, "SQLExecDirect"); 
+		SQLFreeStmt(result->stmt, SQL_DROP);
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	SQLNumResultCols(result->stmt, &(result->numcols));
+	
+	/* For insert, update etc. cols == 0 */
+	if (result->numcols > 0) {
+		if (!odbc_bindcols(result TSRMLS_CC)) {
+			efree(result);
+			RETURN_FALSE;
+		}
+	} else {
+		result->values = NULL;
+	}
+	zend_list_addref(conn->id);
+	result->conn_ptr = conn;
+	result->fetched = 0;
+	ZEND_REGISTER_RESOURCE(return_value, result, le_result);
+}
+/* }}} */
+
+#ifdef PHP_ODBC_HAVE_FETCH_HASH
+#define ODBC_NUM  1
+#define ODBC_OBJECT  2
+
+/* {{{ php_odbc_fetch_hash */
+static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
+{
+	int i;
+	odbc_result *result;
+	RETCODE rc;
+	SQLSMALLINT sql_c_type;
+	char *buf = NULL;
+#ifdef HAVE_SQL_EXTENDED_FETCH
+	SQLULEN crow;
+	SQLUSMALLINT RowStatus[1];
+	SQLLEN rownum;
+	zval *pv_res, *tmp;
+	long pv_row = -1;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &pv_res, &pv_row) == FAILURE) {
+		return;
+	}
+	
+	rownum = pv_row;
+#else
+	zval *pv_res, *tmp;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pv_res) == FAILURE) {
+		return;
+	}
+#endif
+
+	ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
+
+	if (result->numcols == 0) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
+		RETURN_FALSE;
+	}
+
+#ifdef HAVE_SQL_EXTENDED_FETCH
+	if (result->fetch_abs) {
+		if (rownum > 0) {
+			rc = SQLExtendedFetch(result->stmt,SQL_FETCH_ABSOLUTE,rownum,&crow,RowStatus);
+		} else {
+			rc = SQLExtendedFetch(result->stmt,SQL_FETCH_NEXT,1,&crow,RowStatus);
+		}
+	} else
+#endif
+	rc = SQLFetch(result->stmt);
+
+	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
+		RETURN_FALSE;
+	}
+	
+	array_init(return_value);
+	
+#ifdef HAVE_SQL_EXTENDED_FETCH
+	if (rownum > 0 && result->fetch_abs)
+		result->fetched = rownum;
+	else
+#endif
+		result->fetched++;
+
+	for(i = 0; i < result->numcols; i++) {
+		ALLOC_INIT_ZVAL(tmp);
+		Z_TYPE_P(tmp) = IS_STRING;
+		Z_STRLEN_P(tmp) = 0;
+		sql_c_type = SQL_C_CHAR;
+
+		switch(result->values[i].coltype) {
+			case SQL_BINARY:
+			case SQL_VARBINARY:
+			case SQL_LONGVARBINARY:
+				if (result->binmode <= 0) {
+					Z_STRVAL_P(tmp) = STR_EMPTY_ALLOC();
+					break;
+				}
+				if (result->binmode == 1) {
+					sql_c_type = SQL_C_BINARY;
+				}
+			case SQL_LONGVARCHAR:
+				if (IS_SQL_LONG(result->values[i].coltype) && result->longreadlen <= 0) {
+					Z_STRVAL_P(tmp) = STR_EMPTY_ALLOC();
+					break;
+				}				
+				if (buf == NULL) {
+					buf = emalloc(result->longreadlen + 1);
+				}
+				
+				rc = SQLGetData(result->stmt, (SQLUSMALLINT)(i + 1), sql_c_type, buf, result->longreadlen + 1, &result->values[i].vallen);
+
+				if (rc == SQL_ERROR) {
+					odbc_sql_error(result->conn_ptr, result->stmt, "SQLGetData");
+					efree(buf);
+					RETURN_FALSE;
+				}
+
+				if (rc == SQL_SUCCESS_WITH_INFO) {
+					Z_STRLEN_P(tmp) = result->longreadlen;
+				} else if (result->values[i].vallen == SQL_NULL_DATA) {
+					ZVAL_NULL(tmp);
+					break;
+				} else {
+					Z_STRLEN_P(tmp) = result->values[i].vallen;
+				}
+				Z_STRVAL_P(tmp) = estrndup(buf, Z_STRLEN_P(tmp));
+				break;
+
+			default:
+				if (result->values[i].vallen == SQL_NULL_DATA) {
+					ZVAL_NULL(tmp);
+					break;
+				}
+				Z_STRLEN_P(tmp) = result->values[i].vallen;
+				Z_STRVAL_P(tmp) = estrndup(result->values[i].value,Z_STRLEN_P(tmp));
+				break;
+		}
+
+		if (result_type & ODBC_NUM) {
+			zend_hash_index_update(Z_ARRVAL_P(return_value), i, &tmp, sizeof(zval *), NULL);
+		} else {
+			if (!*(result->values[i].name)) {
+				zend_hash_update(Z_ARRVAL_P(return_value), Z_STRVAL_P(tmp),	Z_STRLEN_P(tmp)+1, &tmp, sizeof(zval *), NULL);
+			} else {
+				zend_hash_update(Z_ARRVAL_P(return_value), result->values[i].name, strlen(result->values[i].name)+1, &tmp, sizeof(zval *), NULL);
+			}
+		}
+	}
+	if (buf) {
+		efree(buf);
+	}
+}
+/* }}} */
+
+
+/* {{{ proto object odbc_fetch_object(int result [, int rownumber])
+   Fetch a result row as an object */
+PHP_FUNCTION(odbc_fetch_object)
+{
+	php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, ODBC_OBJECT);
+	if (Z_TYPE_P(return_value) == IS_ARRAY) {
+		object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
+	}
+}
+/* }}} */
+
+/* {{{ proto array odbc_fetch_array(int result [, int rownumber])
+   Fetch a result row as an associative array */
+PHP_FUNCTION(odbc_fetch_array)
+{
+	php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, ODBC_OBJECT);
+}
+/* }}} */
+#endif
+
+/* {{{ proto int odbc_fetch_into(resource result_id, array &result_array, [, int rownumber])
+   Fetch one result row into an array */ 
+PHP_FUNCTION(odbc_fetch_into)
+{
+	int i;
+	odbc_result *result;
+	RETCODE rc;
+	SQLSMALLINT sql_c_type;
+	char *buf = NULL;
+	zval *pv_res, **pv_res_arr, *tmp;
+#ifdef HAVE_SQL_EXTENDED_FETCH
+	long pv_row = 0;
+	SQLULEN crow;
+	SQLUSMALLINT RowStatus[1];
+	SQLLEN rownum = -1;
+#endif /* HAVE_SQL_EXTENDED_FETCH */
+
+#ifdef HAVE_SQL_EXTENDED_FETCH
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ|l", &pv_res, &pv_res_arr, &pv_row) == FAILURE) {
+		return;
+	}
+	
+	rownum = pv_row;
+#else
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pv_res, &pv_res_arr) == FAILURE) {
+		return;
+	}
+#endif /* HAVE_SQL_EXTENDED_FETCH */
+
+	ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
+	
+	if (result->numcols == 0) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
+		RETURN_FALSE;
+	}
+	
+	if (Z_TYPE_PP(pv_res_arr) != IS_ARRAY) {
+		array_init(*pv_res_arr);
+	}
+
+#ifdef HAVE_SQL_EXTENDED_FETCH
+	if (result->fetch_abs) {
+		if (rownum > 0) {
+			rc = SQLExtendedFetch(result->stmt,SQL_FETCH_ABSOLUTE,rownum,&crow,RowStatus);
+		} else {
+			rc = SQLExtendedFetch(result->stmt,SQL_FETCH_NEXT,1,&crow,RowStatus);
+		}
+	} else
+#endif
+		rc = SQLFetch(result->stmt);
+
+	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
+		RETURN_FALSE;
+	}
+
+#ifdef HAVE_SQL_EXTENDED_FETCH
+	if (rownum > 0 && result->fetch_abs)
+		result->fetched = rownum;
+	else
+#endif
+		result->fetched++;
+
+	for(i = 0; i < result->numcols; i++) {
+		MAKE_STD_ZVAL(tmp);
+		Z_TYPE_P(tmp) = IS_STRING;
+		Z_STRLEN_P(tmp) = 0;
+		sql_c_type = SQL_C_CHAR;
+
+		switch(result->values[i].coltype) {
+			case SQL_BINARY:
+			case SQL_VARBINARY:
+			case SQL_LONGVARBINARY:
+				if (result->binmode <= 0) {
+					Z_STRVAL_P(tmp) = STR_EMPTY_ALLOC();
+					break;
+				}
+				if (result->binmode == 1) sql_c_type = SQL_C_BINARY; 
+			case SQL_LONGVARCHAR:
+				if (IS_SQL_LONG(result->values[i].coltype) && result->longreadlen <= 0) {
+					Z_STRVAL_P(tmp) = STR_EMPTY_ALLOC();
+					break;
+				}
+
+				if (buf == NULL) {
+					buf = emalloc(result->longreadlen + 1);
+				}
+				rc = SQLGetData(result->stmt, (SQLUSMALLINT)(i + 1),sql_c_type, buf, result->longreadlen + 1, &result->values[i].vallen);
+
+				if (rc == SQL_ERROR) {
+					odbc_sql_error(result->conn_ptr, result->stmt, "SQLGetData");
+					efree(buf);
+					RETURN_FALSE;
+				}
+				if (rc == SQL_SUCCESS_WITH_INFO) {
+					Z_STRLEN_P(tmp) = result->longreadlen;
+				} else if (result->values[i].vallen == SQL_NULL_DATA) {
+					ZVAL_NULL(tmp);
+					break;
+				} else {
+					Z_STRLEN_P(tmp) = result->values[i].vallen;
+				}
+				Z_STRVAL_P(tmp) = estrndup(buf, Z_STRLEN_P(tmp));
+				break;
+
+			default:
+				if (result->values[i].vallen == SQL_NULL_DATA) {
+					ZVAL_NULL(tmp);
+					break;
+				}
+				Z_STRLEN_P(tmp) = result->values[i].vallen;
+				Z_STRVAL_P(tmp) = estrndup(result->values[i].value,Z_STRLEN_P(tmp));
+				break;
+		}
+		zend_hash_index_update(Z_ARRVAL_PP(pv_res_arr), i, &tmp, sizeof(zval *), NULL);
+	}
+	if (buf) efree(buf);
+	RETURN_LONG(result->numcols);	
+}
+/* }}} */
+
+/* {{{ proto bool solid_fetch_prev(resource result_id)
+   */ 
+#if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) || defined(HAVE_SOLID_35)
+PHP_FUNCTION(solid_fetch_prev)
+{
+	odbc_result *result;
+	RETCODE rc;
+	zval *pv_res;
+	
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pv_res) == FAILURE) {
+		return;
+	}
+	
+	ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
+	if (result->numcols == 0) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
+		RETURN_FALSE;
+	}
+	rc = SQLFetchPrev(result->stmt);
+
+	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
+		RETURN_FALSE;
+	}
+
+	if (result->fetched > 1) {
+		result->fetched--;
+	}
+
+	RETURN_TRUE;
+}
+#endif
+/* }}} */
+
+/* {{{ proto bool odbc_fetch_row(resource result_id [, int row_number])
+   Fetch a row */
+PHP_FUNCTION(odbc_fetch_row)
+{
+	SQLLEN rownum;
+	odbc_result *result;
+	RETCODE rc;
+	zval *pv_res;
+	long pv_row = 1;
+#ifdef HAVE_SQL_EXTENDED_FETCH
+	SQLULEN crow;
+	SQLUSMALLINT RowStatus[1];
+#endif
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &pv_res, &pv_row) == FAILURE) {
+		return;
+	}
+	
+	rownum = pv_row;
+	
+	ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
+	
+	if (result->numcols == 0) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
+		RETURN_FALSE;
+	}
+
+#ifdef HAVE_SQL_EXTENDED_FETCH
+	if (result->fetch_abs) {
+		if (ZEND_NUM_ARGS() > 1) {
+			rc = SQLExtendedFetch(result->stmt,SQL_FETCH_ABSOLUTE,rownum,&crow,RowStatus);
+		} else {
+			rc = SQLExtendedFetch(result->stmt,SQL_FETCH_NEXT,1,&crow,RowStatus);
+		}
+	} else
+#endif
+		rc = SQLFetch(result->stmt);
+
+	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
+		RETURN_FALSE;
+	}
+	
+	if (ZEND_NUM_ARGS() > 1) {
+		result->fetched = rownum;
+	} else {
+		result->fetched++;
+	}
+	
+	RETURN_TRUE;
+}	
+/* }}} */
+
+/* {{{ proto mixed odbc_result(resource result_id, mixed field)
+   Get result data */ 
+PHP_FUNCTION(odbc_result)
+{
+	char *field;
+	int field_ind;
+	SQLSMALLINT sql_c_type = SQL_C_CHAR;
+	odbc_result *result;
+	int i = 0;
+	RETCODE rc;
+	SQLLEN	fieldsize;
+	zval *pv_res, **pv_field;
+#ifdef HAVE_SQL_EXTENDED_FETCH
+	SQLULEN crow;
+	SQLUSMALLINT RowStatus[1];
+#endif
+
+	field_ind = -1;
+	field = NULL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ", &pv_res, &pv_field) == FAILURE) {
+		return;
+	}
+	
+	if (Z_TYPE_PP(pv_field) == IS_STRING) {
+		field = Z_STRVAL_PP(pv_field);
+	} else {
+		convert_to_long_ex(pv_field);
+		field_ind = Z_LVAL_PP(pv_field) - 1;
+	}
+	
+	ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
+	
+	if ((result->numcols == 0)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
+		RETURN_FALSE;
+	}
+	
+	/* get field index if the field parameter was a string */
+	if (field != NULL) {
+		if (result->values == NULL) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Result set contains no data");
+			RETURN_FALSE;
+		}
+
+		for(i = 0; i < result->numcols; i++) {
+			if (!strcasecmp(result->values[i].name, field)) {
+				field_ind = i;
+				break;
+			}
+		}
+
+		if (field_ind < 0) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field %s not found", field);
+			RETURN_FALSE;
+		}
+	} else {
+		/* check for limits of field_ind if the field parameter was an int */
+		if (field_ind >= result->numcols || field_ind < 0) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field index is larger than the number of fields");
+			RETURN_FALSE;
+		}
+	}
+
+	if (result->fetched == 0) {
+		/* User forgot to call odbc_fetch_row(), or wants to reload the results, do it now */
+#ifdef HAVE_SQL_EXTENDED_FETCH
+		if (result->fetch_abs)
+			rc = SQLExtendedFetch(result->stmt, SQL_FETCH_NEXT, 1, &crow,RowStatus);
+		else
+#endif
+			rc = SQLFetch(result->stmt);
+
+		if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
+			RETURN_FALSE;
+		}
+		
+		result->fetched++;
+	}
+
+	switch(result->values[field_ind].coltype) {
+		case SQL_BINARY:
+		case SQL_VARBINARY:
+		case SQL_LONGVARBINARY:
+			if (result->binmode <= 1) {
+				sql_c_type = SQL_C_BINARY;
+			}
+			if (result->binmode <= 0) {
+				break; 
+			}
+		case SQL_LONGVARCHAR:
+			if (IS_SQL_LONG(result->values[field_ind].coltype)) {
+				if (result->longreadlen <= 0) {
+				   break;
+				} else {
+				   fieldsize = result->longreadlen;
+				}
+			} else {
+			   SQLColAttributes(result->stmt, (SQLUSMALLINT)(field_ind + 1), 
+					   			(SQLUSMALLINT)((sql_c_type == SQL_C_BINARY) ? SQL_COLUMN_LENGTH :
+					   			SQL_COLUMN_DISPLAY_SIZE),
+					   			NULL, 0, NULL, &fieldsize);
+			}
+			/* For char data, the length of the returned string will be longreadlen - 1 */
+			fieldsize = (result->longreadlen <= 0) ? 4096 : result->longreadlen;
+			field = emalloc(fieldsize);
+
+		/* SQLGetData will truncate CHAR data to fieldsize - 1 bytes and append \0.
+		 * For binary data it is truncated to fieldsize bytes. 
+		 */
+			rc = SQLGetData(result->stmt, (SQLUSMALLINT)(field_ind + 1), sql_c_type,
+							field, fieldsize, &result->values[field_ind].vallen);
+
+			if (rc == SQL_ERROR) {
+				odbc_sql_error(result->conn_ptr, result->stmt, "SQLGetData");
+				efree(field);
+				RETURN_FALSE;
+			}
+
+			if (result->values[field_ind].vallen == SQL_NULL_DATA) {
+				efree(field);
+				RETURN_NULL();
+			} else if (rc == SQL_NO_DATA_FOUND) {
+				efree(field);
+				RETURN_FALSE;
+			}
+			/* Reduce fieldlen by 1 if we have char data. One day we might 
+			   have binary strings... */
+			if (result->values[field_ind].coltype == SQL_LONGVARCHAR) {
+				fieldsize -= 1;
+			}
+			/* Don't duplicate result, saves one emalloc.
+			   For SQL_SUCCESS, the length is in vallen.
+			 */
+			RETURN_STRINGL(field, (rc == SQL_SUCCESS_WITH_INFO) ? fieldsize : result->values[field_ind].vallen, 0);
+			break;
+			
+		default:
+			if (result->values[field_ind].vallen == SQL_NULL_DATA) {
+				RETURN_NULL();
+			} else {
+				RETURN_STRINGL(result->values[field_ind].value, result->values[field_ind].vallen, 1);
+			}
+			break;
+	}
+
+/* If we come here, output unbound LONG and/or BINARY column data to the client */
+	
+	/* We emalloc 1 byte more for SQL_C_CHAR (trailing \0) */
+	fieldsize = (sql_c_type == SQL_C_CHAR) ? 4096 : 4095;
+	field = emalloc(fieldsize);
+	
+	/* Call SQLGetData() until SQL_SUCCESS is returned */
+	while(1) {
+		rc = SQLGetData(result->stmt, (SQLUSMALLINT)(field_ind + 1),sql_c_type, field, fieldsize, &result->values[field_ind].vallen);
+
+		if (rc == SQL_ERROR) {
+			odbc_sql_error(result->conn_ptr, result->stmt, "SQLGetData");
+			efree(field);
+			RETURN_FALSE;
+		}
+		
+		if (result->values[field_ind].vallen == SQL_NULL_DATA) {
+			efree(field);
+			RETURN_NULL();
+		}
+		/* chop the trailing \0 by outputing only 4095 bytes */
+		PHPWRITE(field,(rc == SQL_SUCCESS_WITH_INFO) ? 4095 : result->values[field_ind].vallen);
+
+		if (rc == SQL_SUCCESS) { /* no more data avail */
+			efree(field);
+			RETURN_TRUE;
+		}
+	}
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto int odbc_result_all(resource result_id [, string format])
+   Print result as HTML table */
+PHP_FUNCTION(odbc_result_all)
+{
+	char *buf = NULL;
+	odbc_result *result;
+	RETCODE rc;
+	zval *pv_res;
+	char *pv_format = NULL;
+	int i, pv_format_len = 0;
+	SQLSMALLINT sql_c_type;
+#ifdef HAVE_SQL_EXTENDED_FETCH
+	SQLULEN crow;
+	SQLUSMALLINT RowStatus[1];
+#endif
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|s", &pv_res, &pv_format, &pv_format_len) == FAILURE) {
+		return;
+	}
+				
+	ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
+	
+	if (result->numcols == 0) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
+		RETURN_FALSE;
+	}
+#ifdef HAVE_SQL_EXTENDED_FETCH
+	if (result->fetch_abs)
+		rc = SQLExtendedFetch(result->stmt,SQL_FETCH_NEXT,1,&crow,RowStatus);
+	else
+#endif	
+		rc = SQLFetch(result->stmt);
+
+	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
+		php_printf("<h2>No rows found</h2>\n");
+		RETURN_LONG(0);
+	}
+	
+	/* Start table tag */
+	if (ZEND_NUM_ARGS() == 1) {
+		php_printf("<table><tr>");
+	} else {
+		php_printf("<table %s ><tr>", pv_format);
+	}
+	
+	for (i = 0; i < result->numcols; i++) {
+		php_printf("<th>%s</th>", result->values[i].name);
+	}
+
+	php_printf("</tr>\n");
+
+	while(rc == SQL_SUCCESS || rc == SQL_SUCCESS_WITH_INFO) {
+		result->fetched++;
+		php_printf("<tr>");
+		for(i = 0; i < result->numcols; i++) {
+			sql_c_type = SQL_C_CHAR;
+			switch(result->values[i].coltype) {
+				case SQL_BINARY:
+				case SQL_VARBINARY:
+				case SQL_LONGVARBINARY:
+					if (result->binmode <= 0) {
+						php_printf("<td>Not printable</td>");
+						break;
+					}
+					if (result->binmode <= 1) sql_c_type = SQL_C_BINARY; 
+				case SQL_LONGVARCHAR:
+					if (IS_SQL_LONG(result->values[i].coltype) && 
+						result->longreadlen <= 0) {
+						php_printf("<td>Not printable</td>"); 
+						break;
+					}
+
+					if (buf == NULL) {
+						buf = emalloc(result->longreadlen);
+					}
+
+					rc = SQLGetData(result->stmt, (SQLUSMALLINT)(i + 1),sql_c_type, buf, result->longreadlen, &result->values[i].vallen);
+ 
+					php_printf("<td>");
+
+					if (rc == SQL_ERROR) {
+						odbc_sql_error(result->conn_ptr, result->stmt, "SQLGetData");
+						php_printf("</td></tr></table>");
+						efree(buf);
+						RETURN_FALSE;
+					}
+					if (rc == SQL_SUCCESS_WITH_INFO) {
+						PHPWRITE(buf, result->longreadlen);
+					} else if (result->values[i].vallen == SQL_NULL_DATA) {
+						php_printf("<td>NULL</td>");
+						break;
+					} else {
+						PHPWRITE(buf, result->values[i].vallen);
+					}
+					php_printf("</td>");
+					break;
+				default:
+					if (result->values[i].vallen == SQL_NULL_DATA) {
+						php_printf("<td>NULL</td>");
+					} else {
+						php_printf("<td>%s</td>", result->values[i].value);
+					}
+					break;
+			}
+		}
+   		php_printf("</tr>\n");
+
+#ifdef HAVE_SQL_EXTENDED_FETCH
+		if (result->fetch_abs)
+			rc = SQLExtendedFetch(result->stmt,SQL_FETCH_NEXT,1,&crow,RowStatus);
+		else
+#endif
+			rc = SQLFetch(result->stmt);		
+	}
+	php_printf("</table>\n");
+	if (buf) efree(buf);
+	RETURN_LONG(result->fetched);
+}
+/* }}} */
+
+/* {{{ proto bool odbc_free_result(resource result_id)
+   Free resources associated with a result */
+PHP_FUNCTION(odbc_free_result)
+{
+	zval *pv_res;
+	odbc_result *result;
+	int i;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pv_res) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
+	if (result->values) {
+		for (i = 0; i < result->numcols; i++) {
+			if (result->values[i].value) {
+				efree(result->values[i].value);
+			}
+		}
+		efree(result->values);
+		result->values = NULL;
+	}
+			
+	zend_list_delete(Z_LVAL_P(pv_res));
+	
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto resource odbc_connect(string DSN, string user, string password [, int cursor_option])
+   Connect to a datasource */
+PHP_FUNCTION(odbc_connect)
+{
+	odbc_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+}
+/* }}} */
+
+/* {{{ proto resource odbc_pconnect(string DSN, string user, string password [, int cursor_option])
+   Establish a persistent connection to a datasource */
+PHP_FUNCTION(odbc_pconnect)
+{
+	odbc_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
+}
+/* }}} */
+
+/* {{{ odbc_sqlconnect */
+int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int cur_opt, int persistent TSRMLS_DC)
+{
+	RETCODE rc;
+	
+	*conn = (odbc_connection *)pemalloc(sizeof(odbc_connection), persistent);
+	(*conn)->persistent = persistent;
+	SQLAllocEnv(&((*conn)->henv));
+	SQLAllocConnect((*conn)->henv, &((*conn)->hdbc));
+	
+#if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) 
+	SQLSetConnectOption((*conn)->hdbc, SQL_TRANSLATE_OPTION,
+			SQL_SOLID_XLATOPT_NOCNV);
+#endif
+#ifdef HAVE_ODBC_ROUTER
+	{
+#define CONNSTRSIZE 2048
+	 char *lpszConnStr = emalloc(CONNSTRSIZE);
+	 if (lpszConnStr && db) {
+		 short cbszConnStr;
+		 if (strstr(db, ";")) {
+			 /* the caller has apparently passed a connection-string */
+			 if (strstr(db, "uid") || strstr(db, "UID")) {
+				 uid = NULL;
+			 }
+			 if (strstr(db, "pwd") || strstr(db, "PWD")) {
+				 pwd = NULL;
+			 }
+			 strlcpy( lpszConnStr, db, CONNSTRSIZE);
+		 }
+		 else {
+			 strcpy(lpszConnStr, "DSN=");
+			 strlcat(lpszConnStr, db, CONNSTRSIZE);
+		 }
+		 if (uid) {
+			 if (uid[0]) {
+				 strlcat(lpszConnStr, ";UID=", CONNSTRSIZE);
+				 strlcat(lpszConnStr, uid, CONNSTRSIZE);
+				 strlcat(lpszConnStr, ";", CONNSTRSIZE);
+			 }
+			 if (pwd) {
+				 if (pwd[0]) {
+					 strlcat(lpszConnStr, "PWD=", CONNSTRSIZE);
+					 strlcat(lpszConnStr, pwd, CONNSTRSIZE);
+					 strlcat(lpszConnStr, ";", CONNSTRSIZE);
+				 }
+			 }
+		 }
+		 rc = SQLDriverConnect((*conn)->hdbc, NULL, lpszConnStr, SQL_NTS, lpszConnStr, CONNSTRSIZE, &cbszConnStr, SQL_DRIVER_NOPROMPT);
+		 efree(lpszConnStr);
+	 }
+	}
+#else
+#ifdef HAVE_OPENLINK
+	{
+		char dsnbuf[1024];
+		short dsnbuflen;
+
+		rc = SQLDriverConnect((*conn)->hdbc, NULL, db, SQL_NTS,	dsnbuf, sizeof(dsnbuf) - 1, &dsnbuflen, SQL_DRIVER_NOPROMPT);
+	}
+#else
+	if (cur_opt != SQL_CUR_DEFAULT) {
+		rc = SQLSetConnectOption((*conn)->hdbc, SQL_ODBC_CURSORS, cur_opt);
+		if (rc != SQL_SUCCESS) {  /* && rc != SQL_SUCCESS_WITH_INFO ? */
+			odbc_sql_error(*conn, SQL_NULL_HSTMT, "SQLSetConnectOption");
+			SQLFreeConnect((*conn)->hdbc);
+			pefree(*conn, persistent);
+			return FALSE;
+		}
+	}
+/*  Possible fix for bug #10250
+ *  Needs testing on UnixODBC < 2.0.5 though. */
+#if defined(HAVE_EMPRESS) || defined(HAVE_UNIXODBC) || defined(PHP_WIN32) || defined (HAVE_IODBC)
+/* *  Uncomment the line above, and comment line below to fully test 
+ * #ifdef HAVE_EMPRESS */
+	{
+		int     direct = 0;
+		char    dsnbuf[1024];
+		short   dsnbuflen;
+		char    *ldb = 0;
+		int		ldb_len = 0;
+
+		if (strstr((char*)db, ";")) {
+			direct = 1;
+			if (uid && !strstr ((char*)db, "uid") && !strstr((char*)db, "UID")) {
+				spprintf(&ldb, 0, "%s;UID=%s;PWD=%s", db, uid, pwd);
+			} else {
+				ldb_len = strlen(db)+1;
+				ldb = (char*) emalloc(ldb_len);
+				memcpy(ldb, db, ldb_len);
+			}
+		}
+
+		if (direct) {
+			rc = SQLDriverConnect((*conn)->hdbc, NULL, ldb, strlen(ldb), dsnbuf, sizeof(dsnbuf) - 1, &dsnbuflen, SQL_DRIVER_NOPROMPT);
+		} else {
+			rc = SQLConnect((*conn)->hdbc, db, SQL_NTS, uid, SQL_NTS, pwd, SQL_NTS);
+		}
+
+		if (ldb) {
+			efree(ldb);
+		}
+	}
+#else
+	rc = SQLConnect((*conn)->hdbc, db, SQL_NTS, uid, SQL_NTS, pwd, SQL_NTS);
+#endif
+#endif
+#endif
+	if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
+		odbc_sql_error(*conn, SQL_NULL_HSTMT, "SQLConnect");
+		SQLFreeConnect((*conn)->hdbc);
+		pefree((*conn), persistent);
+		return FALSE;
+	}
+/*	(*conn)->open = 1;*/
+	return TRUE;
+}
+/* }}} */
+
+/* Persistent connections: two list-types le_pconn, le_conn and a plist
+ * where hashed connection info is stored together with index pointer to
+ * the actual link of type le_pconn in the list. Only persistent 
+ * connections get hashed up. Normal connections use existing pconnections.
+ * Maybe this has to change with regard to transactions on pconnections?
+ * Possibly set autocommit to on on request shutdown.
+ *
+ * We do have to hash non-persistent connections, and reuse connections.
+ * In the case where two connects were being made, without closing the first
+ * connect, access violations were occuring.  This is because some of the
+ * "globals" in this module should actualy be per-connection variables.  I
+ * simply fixed things to get them working for now.  Shane
+ */
+/* {{{ odbc_do_connect */
+void odbc_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
+{
+	char *db, *uid, *pwd;
+	int db_len, uid_len, pwd_len;
+	long pv_opt = SQL_CUR_DEFAULT;
+	odbc_connection *db_conn;
+	char *hashed_details;
+	int hashed_len, cur_opt;
+
+	/*  Now an optional 4th parameter specifying the cursor type
+	 *  defaulting to the cursors default
+	 */
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss|l", &db, &db_len, &uid, &uid_len, &pwd, &pwd_len, &pv_opt) == FAILURE) {
+		return;
+	}
+	
+	cur_opt = pv_opt;
+	
+	if (ZEND_NUM_ARGS() > 3) {
+		/* Confirm the cur_opt range */
+		if (! (cur_opt == SQL_CUR_USE_IF_NEEDED || 
+			cur_opt == SQL_CUR_USE_ODBC || 
+			cur_opt == SQL_CUR_USE_DRIVER || 
+			cur_opt == SQL_CUR_DEFAULT) ) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Cursor type (%d)", cur_opt);
+			RETURN_FALSE;
+		}
+	}
+
+	if (ODBCG(allow_persistent) <= 0) {
+		persistent = 0;
+	}
+
+	hashed_len = spprintf(&hashed_details, 0, "%s_%s_%s_%s_%d", ODBC_TYPE, db, uid, pwd, cur_opt);
+
+	/* FIXME the idea of checking to see if our connection is already persistent
+		is good, but it adds a lot of overhead to non-persistent connections.  We
+		should look and see if we can fix that somehow */
+	/* try to find if we already have this link in our persistent list,
+	 * no matter if it is to be persistent or not
+	 */
+
+try_and_get_another_connection:
+
+	if (persistent) {
+		zend_rsrc_list_entry *le;
+		
+		/* the link is not in the persistent list */
+		if (zend_hash_find(&EG(persistent_list), hashed_details, hashed_len + 1, (void **) &le)	== FAILURE) {
+			zend_rsrc_list_entry new_le;
+			
+			if (ODBCG(max_links) != -1 && ODBCG(num_links) >= ODBCG(max_links)) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", ODBCG(num_links));
+				efree(hashed_details);
+				RETURN_FALSE;
+			}
+			if (ODBCG(max_persistent) != -1 && ODBCG(num_persistent) >= ODBCG(max_persistent)) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING,"Too many open persistent links (%ld)", ODBCG(num_persistent));
+				efree(hashed_details);
+				RETURN_FALSE;
+			}
+			
+			if (!odbc_sqlconnect(&db_conn, db, uid, pwd, cur_opt, 1 TSRMLS_CC)) {
+				efree(hashed_details);
+				RETURN_FALSE;
+			}
+			
+			Z_TYPE(new_le) = le_pconn;
+			new_le.ptr = db_conn;
+			if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_len + 1, &new_le,
+						sizeof(zend_rsrc_list_entry), NULL) == FAILURE) {
+				free(db_conn);
+				efree(hashed_details);
+				RETURN_FALSE;
+			}
+			ODBCG(num_persistent)++;
+			ODBCG(num_links)++;
+			db_conn->id = ZEND_REGISTER_RESOURCE(return_value, db_conn, le_pconn);
+		} else { /* found connection */
+			if (Z_TYPE_P(le) != le_pconn) {
+				RETURN_FALSE;
+			}
+			/*
+			 * check to see if the connection is still valid
+			 */
+			db_conn = (odbc_connection *)le->ptr;
+
+			/*
+			 * check to see if the connection is still in place (lurcher)
+			 */
+			if(ODBCG(check_persistent)){
+				RETCODE ret;
+				UCHAR d_name[32];
+				SQLSMALLINT len;
+
+				ret = SQLGetInfo(db_conn->hdbc, 
+					SQL_DATA_SOURCE_READ_ONLY, 
+					d_name, sizeof(d_name), &len);
+
+				if(ret != SQL_SUCCESS || len == 0) {
+					zend_hash_del(&EG(persistent_list), hashed_details, hashed_len + 1);
+					/* Commented out to fix a possible double closure error 
+					 * when working with persistent connections as submitted by
+					 * bug #15758
+					 *
+					 * safe_odbc_disconnect(db_conn->hdbc);
+					 * SQLFreeConnect(db_conn->hdbc);
+					 */
+					goto try_and_get_another_connection;
+				}
+			}
+		}
+		db_conn->id = ZEND_REGISTER_RESOURCE(return_value, db_conn, le_pconn);
+	} else { /* non persistent */
+		zend_rsrc_list_entry *index_ptr, new_index_ptr;
+		
+		if (zend_hash_find(&EG(regular_list), hashed_details, hashed_len + 1, (void **) &index_ptr) == SUCCESS) {
+			int type, conn_id;
+			void *ptr;
+
+			if (Z_TYPE_P(index_ptr) != le_index_ptr) {
+				RETURN_FALSE;
+			}
+			conn_id = (int)index_ptr->ptr;
+			ptr = zend_list_find(conn_id, &type);   /* check if the connection is still there */
+
+			if (ptr && (type == le_conn || type == le_pconn)) {
+				zend_list_addref(conn_id);
+				Z_LVAL_P(return_value) = conn_id;
+				Z_TYPE_P(return_value) = IS_RESOURCE;
+				efree(hashed_details);
+				return;
+			} else {
+				zend_hash_del(&EG(regular_list), hashed_details, hashed_len + 1);
+			}
+		}
+		if (ODBCG(max_links) != -1 && ODBCG(num_links) >= ODBCG(max_links)) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING,"Too many open connections (%ld)",ODBCG(num_links));
+			efree(hashed_details);
+			RETURN_FALSE;
+		}
+
+		if (!odbc_sqlconnect(&db_conn, db, uid, pwd, cur_opt, 0 TSRMLS_CC)) {
+			efree(hashed_details);
+			RETURN_FALSE;
+		}
+		db_conn->id = ZEND_REGISTER_RESOURCE(return_value, db_conn, le_conn);
+		new_index_ptr.ptr = (void *) Z_LVAL_P(return_value);
+		Z_TYPE(new_index_ptr) = le_index_ptr;
+
+		if (zend_hash_update(&EG(regular_list), hashed_details, hashed_len + 1, (void *) &new_index_ptr,
+				   sizeof(zend_rsrc_list_entry), NULL) == FAILURE) {
+			efree(hashed_details);
+			RETURN_FALSE;
+			/* XXX Free Connection */
+		}
+		ODBCG(num_links)++;
+	}
+	efree(hashed_details);
+}
+/* }}} */
+
+/* {{{ proto void odbc_close(resource connection_id)
+   Close an ODBC connection */
+PHP_FUNCTION(odbc_close)
+{
+	zval *pv_conn;
+	void *ptr;
+	odbc_connection *conn;
+	odbc_result *res;
+	int nument;
+	int i;
+	int type;
+	int is_pconn = 0;
+	int found_resource_type = le_conn;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pv_conn) == FAILURE) {
+		return;
+	}
+
+	conn = (odbc_connection *) zend_fetch_resource(&pv_conn TSRMLS_CC, -1, "ODBC-Link", &found_resource_type, 2, le_conn, le_pconn);
+	if (found_resource_type==le_pconn) {
+		is_pconn = 1;
+	}
+
+	nument = zend_hash_next_free_element(&EG(regular_list));
+
+	for(i = 1; i < nument; i++){
+		ptr = zend_list_find(i, &type);
+		if(ptr && (type == le_result)){
+			res = (odbc_result *)ptr;
+			if(res->conn_ptr == conn){
+				zend_list_delete(i);
+			}
+		}
+	}
+	
+	zend_list_delete(Z_LVAL_P(pv_conn));
+	
+	if(is_pconn){
+		zend_hash_apply_with_argument(&EG(persistent_list),	(apply_func_arg_t) _close_pconn_with_id, (void *) &(Z_LVAL_P(pv_conn)) TSRMLS_CC);	
+	}
+}
+/* }}} */
+
+/* {{{ proto int odbc_num_rows(resource result_id)
+   Get number of rows in a result */
+PHP_FUNCTION(odbc_num_rows)
+{
+	odbc_result *result;
+	SQLLEN rows;
+	zval *pv_res;
+	
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pv_res) == FAILURE) {
+		return;
+	}
+	ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
+	SQLRowCount(result->stmt, &rows);
+	RETURN_LONG(rows);
+}
+/* }}} */
+
+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
+/* {{{ proto bool odbc_next_result(resource result_id)
+   Checks if multiple results are avaiable */
+PHP_FUNCTION(odbc_next_result)
+{
+	odbc_result *result;
+	zval *pv_res;
+	int rc, i;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pv_res) == FAILURE) {
+		return;
+	}
+	ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result); 
+
+	if (result->values) {
+		for(i = 0; i < result->numcols; i++) {
+			if (result->values[i].value) {
+				efree(result->values[i].value);
+			}
+		}
+		efree(result->values);
+		result->values = NULL;
+	}
+
+	result->fetched = 0;
+	rc = SQLMoreResults(result->stmt);
+	if (rc == SQL_SUCCESS_WITH_INFO || rc == SQL_SUCCESS) {
+		rc = SQLFreeStmt(result->stmt, SQL_UNBIND);
+		SQLNumParams(result->stmt, &(result->numparams));
+		SQLNumResultCols(result->stmt, &(result->numcols));
+
+		if (result->numcols > 0) {
+			if (!odbc_bindcols(result TSRMLS_CC)) {
+				efree(result);
+				RETVAL_FALSE;
+			}
+		} else {
+			result->values = NULL;
+		}
+		RETURN_TRUE;
+	} else if (rc == SQL_NO_DATA_FOUND) {
+		RETURN_FALSE;
+	} else {
+		odbc_sql_error(result->conn_ptr, result->stmt, "SQLMoreResults");
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+#endif
+
+/* {{{ proto int odbc_num_fields(resource result_id)
+   Get number of columns in a result */
+PHP_FUNCTION(odbc_num_fields)
+{
+	odbc_result *result;
+	zval *pv_res;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &pv_res) == FAILURE) {
+		return;
+	}
+	ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
+	RETURN_LONG(result->numcols);
+}
+/* }}} */
+
+/* {{{ proto string odbc_field_name(resource result_id, int field_number)
+   Get a column name */
+PHP_FUNCTION(odbc_field_name)
+{
+	odbc_result *result;
+	zval *pv_res;
+	long pv_num;
+	
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &pv_res, &pv_num) == FAILURE) {
+		return;
+	}
+	
+	ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
+	
+	if (result->numcols == 0) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
+		RETURN_FALSE;
+	}
+	
+	if (pv_num > result->numcols) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field index larger than number of fields");
+		RETURN_FALSE;
+	}
+	
+	if (pv_num < 1) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field numbering starts at 1");
+		RETURN_FALSE;
+	}
+	
+	RETURN_STRING(result->values[pv_num - 1].name, 1);
+}
+/* }}} */
+
+/* {{{ proto string odbc_field_type(resource result_id, int field_number)
+   Get the datatype of a column */
+PHP_FUNCTION(odbc_field_type)
+{
+	odbc_result	*result;
+	char    	tmp[32];
+	SQLSMALLINT	tmplen;
+	zval		*pv_res;
+	long		pv_num;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &pv_res, &pv_num) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
+
+	if (result->numcols == 0) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
+		RETURN_FALSE;
+	}
+	
+	if (pv_num > result->numcols) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field index larger than number of fields");
+		RETURN_FALSE;
+	}
+
+	if (pv_num < 1) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field numbering starts at 1");
+		RETURN_FALSE;
+	}
+
+	SQLColAttributes(result->stmt, (SQLUSMALLINT)pv_num, SQL_COLUMN_TYPE_NAME, tmp, 31, &tmplen, NULL);
+	RETURN_STRING(tmp,1)
+}
+/* }}} */
+
+/* {{{ proto int odbc_field_len(resource result_id, int field_number)
+   Get the length (precision) of a column */
+PHP_FUNCTION(odbc_field_len)
+{
+	odbc_column_lengths(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+}
+/* }}} */
+
+/* {{{ proto int odbc_field_scale(resource result_id, int field_number)
+   Get the scale of a column */
+PHP_FUNCTION(odbc_field_scale)
+{
+	odbc_column_lengths(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);	
+}
+/* }}} */
+
+/* {{{ proto int odbc_field_num(resource result_id, string field_name)
+   Return column number */
+PHP_FUNCTION(odbc_field_num)
+{
+	char *fname;
+	int i, field_ind, fname_len;
+	odbc_result *result;
+	zval *pv_res;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &pv_res, &fname, &fname_len) == FAILURE) {
+		return;
+	}
+	
+	ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_res, -1, "ODBC result", le_result);
+	
+	if (result->numcols == 0) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No tuples available at this result index");
+		RETURN_FALSE;
+	}
+
+	field_ind = -1;
+	for(i = 0; i < result->numcols; i++) {
+		if (strcasecmp(result->values[i].name, fname) == 0) {
+			field_ind = i + 1;
+		}
+	}
+
+	if (field_ind == -1) {
+		RETURN_FALSE;
+	}
+	RETURN_LONG(field_ind);
+}
+/* }}} */
+
+/* {{{ proto mixed odbc_autocommit(resource connection_id [, int OnOff])
+   Toggle autocommit mode or get status */
+/* There can be problems with pconnections!*/
+PHP_FUNCTION(odbc_autocommit)
+{
+	odbc_connection *conn;
+	RETCODE rc;
+	zval *pv_conn;
+	long pv_onoff = 0;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &pv_conn, &pv_onoff) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
+	
+	if (ZEND_NUM_ARGS() > 1) {
+		rc = SQLSetConnectOption(conn->hdbc, SQL_AUTOCOMMIT, (pv_onoff) ? SQL_AUTOCOMMIT_ON : SQL_AUTOCOMMIT_OFF);
+		if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
+			odbc_sql_error(conn, SQL_NULL_HSTMT, "Set autocommit");
+			RETURN_FALSE;
+		}
+		RETVAL_TRUE;
+	} else {
+		SQLINTEGER status;
+
+		rc = SQLGetConnectOption(conn->hdbc, SQL_AUTOCOMMIT, (PTR)&status);
+		if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
+			odbc_sql_error(conn, SQL_NULL_HSTMT, "Get commit status");
+			RETURN_FALSE;
+		}
+		RETVAL_LONG((long)status);
+	}
+}
+/* }}} */
+
+/* {{{ proto bool odbc_commit(resource connection_id)
+   Commit an ODBC transaction */
+PHP_FUNCTION(odbc_commit)
+{
+	odbc_transact(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
+}
+/* }}} */
+
+/* {{{ proto bool odbc_rollback(resource connection_id)
+   Rollback a transaction */
+PHP_FUNCTION(odbc_rollback)
+{
+	odbc_transact(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+}
+/* }}} */
+
+/* {{{ php_odbc_lasterror */
+static void php_odbc_lasterror(INTERNAL_FUNCTION_PARAMETERS, int mode)
+{
+	odbc_connection *conn;
+	zval *pv_handle;
+	char *ptr;
+	int len;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &pv_handle) == FAILURE) {
+		return;
+	}
+
+	if (mode == 0) {  /* last state */
+		len = 6;
+	} else { /* last error message */
+		len = SQL_MAX_MESSAGE_LENGTH;
+	}
+
+	if (ZEND_NUM_ARGS() == 1) {
+		ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_handle, -1, "ODBC-Link", le_conn, le_pconn);
+		ptr = ecalloc(len + 1, 1);
+		if (mode == 0) {
+			strlcpy(ptr, conn->laststate, len+1);
+		} else {
+			strlcpy(ptr, conn->lasterrormsg, len+1);
+		}
+	} else {
+		ptr = ecalloc(len + 1, 1);
+		if (mode == 0) {
+			strlcpy(ptr, ODBCG(laststate), len+1);
+		} else {
+			strlcpy(ptr, ODBCG(lasterrormsg), len+1);
+		}
+	}
+	RETVAL_STRING(ptr, 0);
+}
+/* }}} */
+
+/* {{{ proto string odbc_error([resource connection_id])
+   Get the last error code */
+PHP_FUNCTION(odbc_error)
+{
+	php_odbc_lasterror(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+}
+/* }}} */
+
+/* {{{ proto string odbc_errormsg([resource connection_id])
+   Get the last error message */
+PHP_FUNCTION(odbc_errormsg)
+{
+	php_odbc_lasterror(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
+}
+/* }}} */
+
+/* {{{ proto bool odbc_setoption(resource conn_id|result_id, int which, int option, int value)
+   Sets connection or statement options */
+/* This one has to be used carefully. We can't allow to set connection options for
+   persistent connections. I think that SetStmtOption is of little use, since most
+   of those can only be specified before preparing/executing statements.
+   On the other hand, they can be made connection wide default through SetConnectOption
+   - but will be overidden by calls to SetStmtOption() in odbc_prepare/odbc_do
+*/
+PHP_FUNCTION(odbc_setoption)
+{
+	odbc_connection *conn;
+	odbc_result	*result;
+	RETCODE rc;
+	zval *pv_handle;
+	long pv_which, pv_opt, pv_val;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlll", &pv_handle, &pv_which, &pv_opt, &pv_val) == FAILURE) {
+		return;
+	}
+
+	switch (pv_which) {
+		case 1:		/* SQLSetConnectOption */
+			ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_handle, -1, "ODBC-Link", le_conn, le_pconn);
+
+			if (conn->persistent) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set option for persistent connection");
+				RETURN_FALSE;
+			}
+			rc = SQLSetConnectOption(conn->hdbc, (unsigned short) pv_opt, pv_val);
+			if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
+				odbc_sql_error(conn, SQL_NULL_HSTMT, "SetConnectOption");
+				RETURN_FALSE;
+			}
+			break;
+		case 2:		/* SQLSetStmtOption */
+			ZEND_FETCH_RESOURCE(result, odbc_result *, &pv_handle, -1, "ODBC result", le_result);
+			
+			rc = SQLSetStmtOption(result->stmt, (unsigned short) pv_opt, pv_val);
+
+			if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
+				odbc_sql_error(result->conn_ptr, result->stmt, "SetStmtOption");
+				RETURN_FALSE;
+			}
+			break;
+		default:
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown option type");
+			RETURN_FALSE;
+			break;
+	}
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/*
+ * metadata functions
+ */
+
+/* {{{ proto resource odbc_tables(resource connection_id [, string qualifier [, string owner [, string name [, string table_types]]]])
+   Call the SQLTables function */
+PHP_FUNCTION(odbc_tables)
+{
+	zval *pv_conn;
+	odbc_result   *result = NULL;
+	odbc_connection *conn;
+	char *cat = NULL, *schema = NULL, *table = NULL, *type = NULL;
+	int cat_len = 0, schema_len = 0, table_len = 0, type_len = 0;
+	RETCODE rc;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|s!sss", &pv_conn, &cat, &cat_len, &schema, &schema_len, 
+		&table, &table_len, &type, &type_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
+
+	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
+	
+	rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+	if (rc == SQL_INVALID_HANDLE) {
+		efree(result);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
+		RETURN_FALSE;
+	}
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLAllocStmt");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	/* This hack is needed to access table information in Access databases (fmk) */
+	if (table && table_len && schema && schema_len == 0) {
+		schema = NULL;
+	}
+
+	rc = SQLTables(result->stmt, 
+			cat, SAFE_SQL_NTS(cat), 
+			schema,	SAFE_SQL_NTS(schema), 
+			table, SAFE_SQL_NTS(table),
+			type, SAFE_SQL_NTS(type));
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLTables");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	result->numparams = 0;
+	SQLNumResultCols(result->stmt, &(result->numcols));
+
+	if (result->numcols > 0) {
+		if (!odbc_bindcols(result TSRMLS_CC)) {
+			efree(result);
+			RETURN_FALSE;
+		}
+	} else {
+		result->values = NULL;
+	}
+	result->conn_ptr = conn;
+	result->fetched = 0;
+	ZEND_REGISTER_RESOURCE(return_value, result, le_result);
+}
+/* }}} */
+
+/* {{{ proto resource odbc_columns(resource connection_id [, string qualifier [, string owner [, string table_name [, string column_name]]]])
+   Returns a result identifier that can be used to fetch a list of column names in specified tables */
+PHP_FUNCTION(odbc_columns)
+{
+	zval *pv_conn;
+	odbc_result *result = NULL;
+	odbc_connection *conn;
+	char *cat = NULL, *schema = NULL, *table = NULL, *column = NULL;
+	int cat_len = 0, schema_len = 0, table_len = 0, column_len = 0;
+	RETCODE rc;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|s!sss", &pv_conn, &cat, &cat_len, &schema, &schema_len,
+		&table, &table_len, &column, &column_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
+
+	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
+	
+	rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+	if (rc == SQL_INVALID_HANDLE) {
+		efree(result);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
+		RETURN_FALSE;
+	}
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLAllocStmt");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	/* 
+	 * Needed to make MS Access happy
+	 */
+	if (table && table_len && schema && schema_len == 0) {
+		schema = NULL;
+	}
+
+	rc = SQLColumns(result->stmt, 
+			cat, (SQLSMALLINT) cat_len,
+			schema, (SQLSMALLINT) schema_len,
+			table, (SQLSMALLINT) table_len,
+			column, (SQLSMALLINT) column_len);
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLColumns");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	result->numparams = 0;
+	SQLNumResultCols(result->stmt, &(result->numcols));
+
+	if (result->numcols > 0) {
+		if (!odbc_bindcols(result TSRMLS_CC)) {
+			efree(result);
+			RETURN_FALSE;
+		}
+	} else {
+		result->values = NULL;
+	}
+	result->conn_ptr = conn;
+	result->fetched = 0;
+	ZEND_REGISTER_RESOURCE(return_value, result, le_result);
+}
+/* }}} */
+
+#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) && !defined(HAVE_BIRDSTEP)
+/* {{{ proto resource odbc_columnprivileges(resource connection_id, string catalog, string schema, string table, string column)
+   Returns a result identifier that can be used to fetch a list of columns and associated privileges for the specified table */
+PHP_FUNCTION(odbc_columnprivileges)
+{
+	zval *pv_conn;
+	odbc_result *result = NULL;
+	odbc_connection *conn;
+	char *cat = NULL, *schema, *table, *column;
+	int cat_len = 0, schema_len, table_len, column_len;
+	RETCODE rc;
+	
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs!sss", &pv_conn, &cat, &cat_len, &schema, &schema_len,
+		&table, &table_len, &column, &column_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
+
+	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
+	
+	rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+	if (rc == SQL_INVALID_HANDLE) {
+		efree(result);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
+		RETURN_FALSE;
+	}
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLAllocStmt");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	rc = SQLColumnPrivileges(result->stmt, 
+			cat, SAFE_SQL_NTS(cat),
+			schema, SAFE_SQL_NTS(schema),
+			table, SAFE_SQL_NTS(table),
+			column, SAFE_SQL_NTS(column));
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLColumnPrivileges");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	result->numparams = 0;
+	SQLNumResultCols(result->stmt, &(result->numcols));
+
+	if (result->numcols > 0) {
+		if (!odbc_bindcols(result TSRMLS_CC)) {
+			efree(result);
+			RETURN_FALSE;
+		}
+	} else {
+		result->values = NULL;
+	}
+	result->conn_ptr = conn;
+	result->fetched = 0;
+	ZEND_REGISTER_RESOURCE(return_value, result, le_result);
+}
+/* }}} */
+#endif /* HAVE_DBMAKER || HAVE_SOLID*/
+
+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
+/* {{{ proto resource odbc_foreignkeys(resource connection_id, string pk_qualifier, string pk_owner, string pk_table, string fk_qualifier, string fk_owner, string fk_table)
+   Returns a result identifier to either a list of foreign keys in the specified table or a list of foreign keys in other tables that refer to the primary key in the specified table */
+PHP_FUNCTION(odbc_foreignkeys)
+{
+	zval *pv_conn;
+	odbc_result *result = NULL;
+	odbc_connection *conn;
+	char *pcat = NULL, *pschema, *ptable, *fcat, *fschema, *ftable;
+	int pcat_len = 0, pschema_len, ptable_len, fcat_len, fschema_len, ftable_len;
+	RETCODE rc;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs!sssss", &pv_conn, &pcat, &pcat_len, &pschema, &pschema_len, 
+		&ptable, &ptable_len, &fcat, &fcat_len, &fschema, &fschema_len, &ftable, &ftable_len) == FAILURE) {
+		return;
+	}
+
+#if defined(HAVE_DBMAKER) || defined(HAVE_IBMDB2)
+#define EMPTY_TO_NULL(xstr) \
+	if ((int)strlen((xstr)) == 0) (xstr) = NULL
+
+		EMPTY_TO_NULL(pcat);
+		EMPTY_TO_NULL(pschema);
+		EMPTY_TO_NULL(ptable);
+		EMPTY_TO_NULL(fcat);
+		EMPTY_TO_NULL(fschema);
+		EMPTY_TO_NULL(ftable);
+#endif
+
+	ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
+
+	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
+	
+	rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+	if (rc == SQL_INVALID_HANDLE) {
+		efree(result);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
+		RETURN_FALSE;
+	}
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLAllocStmt");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	rc = SQLForeignKeys(result->stmt, 
+			pcat, SAFE_SQL_NTS(pcat), 
+			pschema, SAFE_SQL_NTS(pschema), 
+			ptable, SAFE_SQL_NTS(ptable), 
+			fcat, SAFE_SQL_NTS(fcat), 
+			fschema, SAFE_SQL_NTS(fschema), 
+			ftable, SAFE_SQL_NTS(ftable) );
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLForeignKeys");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	result->numparams = 0;
+	SQLNumResultCols(result->stmt, &(result->numcols));
+
+	if (result->numcols > 0) {
+		if (!odbc_bindcols(result TSRMLS_CC)) {
+			efree(result);
+			RETURN_FALSE;
+		}
+	} else {
+		result->values = NULL;
+	}
+	result->conn_ptr = conn;
+	result->fetched = 0;
+	ZEND_REGISTER_RESOURCE(return_value, result, le_result);
+}
+/* }}} */
+#endif /* HAVE_SOLID */
+
+/* {{{ proto resource odbc_gettypeinfo(resource connection_id [, int data_type])
+   Returns a result identifier containing information about data types supported by the data source */
+PHP_FUNCTION(odbc_gettypeinfo)
+{
+	zval *pv_conn;
+	long pv_data_type = SQL_ALL_TYPES;
+	odbc_result *result = NULL;
+	odbc_connection *conn;
+	RETCODE rc;
+	SQLSMALLINT data_type;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &pv_conn, &pv_data_type) == FAILURE) {
+		return;
+	}
+	
+	data_type = (SQLSMALLINT) pv_data_type;
+
+	ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
+
+	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
+	
+	rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+	if (rc == SQL_INVALID_HANDLE) {
+		efree(result);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
+		RETURN_FALSE;
+	}
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLAllocStmt");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	rc = SQLGetTypeInfo(result->stmt, data_type );
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLGetTypeInfo");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	result->numparams = 0;
+	SQLNumResultCols(result->stmt, &(result->numcols));
+
+	if (result->numcols > 0) {
+		if (!odbc_bindcols(result TSRMLS_CC)) {
+			efree(result);
+			RETURN_FALSE;
+		}
+	} else {
+		result->values = NULL;
+	}
+	result->conn_ptr = conn;
+	result->fetched = 0;
+	ZEND_REGISTER_RESOURCE(return_value, result, le_result);
+}
+/* }}} */
+
+/* {{{ proto resource odbc_primarykeys(resource connection_id, string qualifier, string owner, string table)
+   Returns a result identifier listing the column names that comprise the primary key for a table */
+PHP_FUNCTION(odbc_primarykeys)
+{
+	zval *pv_conn;
+	odbc_result   *result = NULL;
+	odbc_connection *conn;
+	char *cat = NULL, *schema = NULL, *table = NULL;
+	int cat_len = 0, schema_len, table_len;
+	RETCODE rc;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs!ss", &pv_conn, &cat, &cat_len, &schema, &schema_len, &table, &table_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
+
+	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
+	
+	rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+	if (rc == SQL_INVALID_HANDLE) {
+		efree(result);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
+		RETURN_FALSE;
+	}
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLAllocStmt");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	rc = SQLPrimaryKeys(result->stmt, 
+			cat, SAFE_SQL_NTS(cat), 
+			schema, SAFE_SQL_NTS(schema), 
+			table, SAFE_SQL_NTS(table) );
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLPrimaryKeys");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	result->numparams = 0;
+	SQLNumResultCols(result->stmt, &(result->numcols));
+
+	if (result->numcols > 0) {
+		if (!odbc_bindcols(result TSRMLS_CC)) {
+			efree(result);
+			RETURN_FALSE;
+		}
+	} else {
+		result->values = NULL;
+	}
+	result->conn_ptr = conn;
+	result->fetched = 0;
+	ZEND_REGISTER_RESOURCE(return_value, result, le_result);
+}
+/* }}} */
+
+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) && !defined(HAVE_BIRDSTEP)
+/* {{{ proto resource odbc_procedurecolumns(resource connection_id [, string qualifier, string owner, string proc, string column])
+   Returns a result identifier containing the list of input and output parameters, as well as the columns that make up the result set for the specified procedures */
+PHP_FUNCTION(odbc_procedurecolumns)
+{
+	zval *pv_conn;
+	odbc_result *result = NULL;
+	odbc_connection *conn;
+	char *cat = NULL, *schema = NULL, *proc = NULL, *col = NULL;
+	int cat_len = 0, schema_len = 0, proc_len = 0, col_len = 0;
+	RETCODE rc;
+	
+	if (ZEND_NUM_ARGS() != 1 && ZEND_NUM_ARGS() != 5) {
+		WRONG_PARAM_COUNT;
+	}
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|s!sss", &pv_conn, &cat, &cat_len, &schema, &schema_len, 
+		&proc, &proc_len, &col, &col_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
+
+	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
+	
+	rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+	if (rc == SQL_INVALID_HANDLE) {
+		efree(result);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
+		RETURN_FALSE;
+	}
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLAllocStmt");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	rc = SQLProcedureColumns(result->stmt, 
+			cat, SAFE_SQL_NTS(cat), 
+			schema, SAFE_SQL_NTS(schema), 
+			proc, SAFE_SQL_NTS(proc), 
+			col, SAFE_SQL_NTS(col) );
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLProcedureColumns");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	result->numparams = 0;
+	SQLNumResultCols(result->stmt, &(result->numcols));
+
+	if (result->numcols > 0) {
+		if (!odbc_bindcols(result TSRMLS_CC)) {
+			efree(result);
+			RETURN_FALSE;
+		}
+	} else {
+		result->values = NULL;
+	}
+	result->conn_ptr = conn;
+	result->fetched = 0;
+	ZEND_REGISTER_RESOURCE(return_value, result, le_result);
+}
+/* }}} */
+#endif /* HAVE_SOLID */
+
+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
+/* {{{ proto resource odbc_procedures(resource connection_id [, string qualifier, string owner, string name])
+   Returns a result identifier containg the list of procedure names in a datasource */
+PHP_FUNCTION(odbc_procedures)
+{
+	zval *pv_conn;
+	odbc_result   *result = NULL;
+	odbc_connection *conn;
+	char *cat = NULL, *schema = NULL, *proc = NULL;
+	int cat_len = 0, schema_len = 0, proc_len = 0;
+	RETCODE rc;
+
+	if (ZEND_NUM_ARGS() != 1 && ZEND_NUM_ARGS() != 4) {
+		WRONG_PARAM_COUNT;
+	}
+	
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|s!ss", &pv_conn, &cat, &cat_len, &schema, &schema_len, &proc, &proc_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
+
+	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
+	
+	rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+	if (rc == SQL_INVALID_HANDLE) {
+		efree(result);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
+		RETURN_FALSE;
+	}
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLAllocStmt");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	rc = SQLProcedures(result->stmt, 
+			cat, SAFE_SQL_NTS(cat), 
+			schema, SAFE_SQL_NTS(schema), 
+			proc, SAFE_SQL_NTS(proc) );
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLProcedures");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	result->numparams = 0;
+	SQLNumResultCols(result->stmt, &(result->numcols));
+
+	if (result->numcols > 0) {
+		if (!odbc_bindcols(result TSRMLS_CC)) {
+			efree(result);
+			RETURN_FALSE;
+		}
+	} else {
+		result->values = NULL;
+	}
+	result->conn_ptr = conn;
+	result->fetched = 0;
+	ZEND_REGISTER_RESOURCE(return_value, result, le_result);
+}
+/* }}} */
+#endif /* HAVE_SOLID */
+
+/* {{{ proto resource odbc_specialcolumns(resource connection_id, int type, string qualifier, string owner, string table, int scope, int nullable)
+   Returns a result identifier containing either the optimal set of columns that uniquely identifies a row in the table or columns that are automatically updated when any value in the row is updated by a transaction */
+PHP_FUNCTION(odbc_specialcolumns)
+{
+	zval *pv_conn;
+	long vtype, vscope, vnullable;
+	odbc_result *result = NULL;
+	odbc_connection *conn;
+	char *cat = NULL, *schema = NULL, *name = NULL;
+	int cat_len = 0, schema_len, name_len;
+	SQLUSMALLINT type, scope, nullable;
+	RETCODE rc;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rls!ssll", &pv_conn, &vtype, &cat, &cat_len, &schema, &schema_len,
+		&name, &name_len, &vscope, &vnullable) == FAILURE) {
+		return;
+	}
+	
+	type = (SQLUSMALLINT) vtype;
+	scope = (SQLUSMALLINT) vscope;
+	nullable = (SQLUSMALLINT) vnullable;
+
+	ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
+
+	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
+	
+	rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+	if (rc == SQL_INVALID_HANDLE) {
+		efree(result);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
+		RETURN_FALSE;
+	}
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLAllocStmt");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	rc = SQLSpecialColumns(result->stmt, 
+			type,
+			cat, SAFE_SQL_NTS(cat), 
+			schema, SAFE_SQL_NTS(schema), 
+			name, SAFE_SQL_NTS(name),
+			scope,
+			nullable);
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLSpecialColumns");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	result->numparams = 0;
+	SQLNumResultCols(result->stmt, &(result->numcols));
+
+	if (result->numcols > 0) {
+		if (!odbc_bindcols(result TSRMLS_CC)) {
+			efree(result);
+			RETURN_FALSE;
+		}
+	} else {
+		result->values = NULL;
+	}
+	result->conn_ptr = conn;
+	result->fetched = 0;
+	ZEND_REGISTER_RESOURCE(return_value, result, le_result);
+}
+/* }}} */
+
+/* {{{ proto resource odbc_statistics(resource connection_id, string qualifier, string owner, string name, int unique, int accuracy)
+   Returns a result identifier that contains statistics about a single table and the indexes associated with the table */
+PHP_FUNCTION(odbc_statistics)
+{
+	zval *pv_conn;
+	long vunique, vreserved;
+	odbc_result *result = NULL;
+	odbc_connection *conn;
+	char *cat = NULL, *schema, *name;
+	int cat_len = 0, schema_len, name_len;
+	SQLUSMALLINT unique, reserved;
+	RETCODE rc;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs!ssll", &pv_conn, &cat, &cat_len, &schema, &schema_len,
+		&name, &name_len, &vunique, &vreserved) == FAILURE) {
+		return;
+	}
+	
+	unique = (SQLUSMALLINT) vunique;
+	reserved = (SQLUSMALLINT) vreserved;
+
+	ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
+
+	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
+	
+	rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+	if (rc == SQL_INVALID_HANDLE) {
+		efree(result);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
+		RETURN_FALSE;
+	}
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLAllocStmt");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	rc = SQLStatistics(result->stmt, 
+			cat, SAFE_SQL_NTS(cat),
+			schema, SAFE_SQL_NTS(schema), 
+			name, SAFE_SQL_NTS(name),
+			unique,
+			reserved);
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLStatistics");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	result->numparams = 0;
+	SQLNumResultCols(result->stmt, &(result->numcols));
+
+	if (result->numcols > 0) {
+		if (!odbc_bindcols(result TSRMLS_CC)) {
+			efree(result);
+			RETURN_FALSE;
+		}
+	} else {
+		result->values = NULL;
+	}
+	result->conn_ptr = conn;
+	result->fetched = 0;
+	ZEND_REGISTER_RESOURCE(return_value, result, le_result);
+}
+/* }}} */
+
+#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) && !defined(HAVE_BIRDSTEP)
+/* {{{ proto resource odbc_tableprivileges(resource connection_id, string qualifier, string owner, string name)
+   Returns a result identifier containing a list of tables and the privileges associated with each table */
+PHP_FUNCTION(odbc_tableprivileges)
+{
+	zval *pv_conn;
+	odbc_result   *result = NULL;
+	odbc_connection *conn;
+	char *cat = NULL, *schema = NULL, *table = NULL;
+	int cat_len = 0, schema_len, table_len;
+	RETCODE rc;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs!ss", &pv_conn, &cat, &cat_len, &schema, &schema_len, &table, &table_len) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE2(conn, odbc_connection *, &pv_conn, -1, "ODBC-Link", le_conn, le_pconn);
+
+	result = (odbc_result *)ecalloc(1, sizeof(odbc_result));
+	
+	rc = SQLAllocStmt(conn->hdbc, &(result->stmt));
+	if (rc == SQL_INVALID_HANDLE) {
+		efree(result);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SQLAllocStmt error 'Invalid Handle'");
+		RETURN_FALSE;
+	}
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLAllocStmt");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	rc = SQLTablePrivileges(result->stmt, 
+			cat, SAFE_SQL_NTS(cat), 
+			schema, SAFE_SQL_NTS(schema), 
+			table, SAFE_SQL_NTS(table));
+
+	if (rc == SQL_ERROR) {
+		odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLTablePrivileges");
+		efree(result);
+		RETURN_FALSE;
+	}
+
+	result->numparams = 0;
+	SQLNumResultCols(result->stmt, &(result->numcols));
+
+	if (result->numcols > 0) {
+		if (!odbc_bindcols(result TSRMLS_CC)) {
+			efree(result);
+			RETURN_FALSE;
+		}
+	} else {
+		result->values = NULL;
+	}
+	result->conn_ptr = conn;
+	result->fetched = 0;
+	ZEND_REGISTER_RESOURCE(return_value, result, le_result);
+}
+/* }}} */
+#endif /* HAVE_DBMAKER */
+
+#endif /* HAVE_UODBC */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h
new file mode 100644
index 0000000..7e8d26d
--- /dev/null
+++ b/ext/odbc/php_odbc.h
@@ -0,0 +1,117 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2013 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Stig Sæther Bakken <ssb@php.net>                            |
+   |          Andreas Karajannis <Andreas.Karajannis@gmd.de>              |
+   |	      Kevin N. Shallow <kshallow@tampabay.rr.com> (Birdstep)      |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef PHP_ODBC_H
+#define PHP_ODBC_H
+
+#if HAVE_UODBC
+#define ODBCVER 0x0250
+
+#ifdef ZTS
+#include "TSRM.h"
+#endif
+
+extern zend_module_entry odbc_module_entry;
+#define odbc_module_ptr &odbc_module_entry
+
+#if defined(HAVE_DBMAKER) || defined(PHP_WIN32) || defined(HAVE_IBMDB2) || defined(HAVE_UNIXODBC) || defined(HAVE_BIRDSTEP) || defined(HAVE_IODBC)
+# define PHP_ODBC_HAVE_FETCH_HASH 1
+#endif
+
+/* user functions */
+PHP_MINIT_FUNCTION(odbc);
+PHP_MSHUTDOWN_FUNCTION(odbc);
+PHP_RINIT_FUNCTION(odbc);
+PHP_RSHUTDOWN_FUNCTION(odbc);
+PHP_MINFO_FUNCTION(odbc);
+
+PHP_FUNCTION(odbc_error);
+PHP_FUNCTION(odbc_errormsg);
+PHP_FUNCTION(odbc_setoption);
+PHP_FUNCTION(odbc_autocommit);
+PHP_FUNCTION(odbc_close);
+PHP_FUNCTION(odbc_close_all);
+PHP_FUNCTION(odbc_commit);
+PHP_FUNCTION(odbc_connect);
+PHP_FUNCTION(odbc_pconnect);
+PHP_FUNCTION(odbc_cursor);
+#ifdef HAVE_SQLDATASOURCES
+PHP_FUNCTION(odbc_data_source);
+#endif
+PHP_FUNCTION(odbc_do);
+PHP_FUNCTION(odbc_exec);
+PHP_FUNCTION(odbc_execute);
+#ifdef PHP_ODBC_HAVE_FETCH_HASH
+PHP_FUNCTION(odbc_fetch_array);
+PHP_FUNCTION(odbc_fetch_object);
+#endif
+PHP_FUNCTION(odbc_fetch_into);
+PHP_FUNCTION(odbc_fetch_row);
+PHP_FUNCTION(odbc_field_len);
+PHP_FUNCTION(odbc_field_scale);
+PHP_FUNCTION(odbc_field_name);
+PHP_FUNCTION(odbc_field_type);
+PHP_FUNCTION(odbc_field_num);
+PHP_FUNCTION(odbc_free_result);
+#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
+PHP_FUNCTION(odbc_next_result);
+#endif
+PHP_FUNCTION(odbc_num_fields);
+PHP_FUNCTION(odbc_num_rows);
+PHP_FUNCTION(odbc_prepare);
+PHP_FUNCTION(odbc_result);
+PHP_FUNCTION(odbc_result_all);
+PHP_FUNCTION(odbc_rollback);
+PHP_FUNCTION(odbc_binmode);
+PHP_FUNCTION(odbc_longreadlen);
+PHP_FUNCTION(odbc_tables);
+PHP_FUNCTION(odbc_columns);
+#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_35)    /* not supported now */
+PHP_FUNCTION(odbc_columnprivileges);
+PHP_FUNCTION(odbc_tableprivileges);
+#endif
+#if !defined(HAVE_SOLID) || !defined(HAVE_SOLID_35)    /* not supported */
+PHP_FUNCTION(odbc_foreignkeys);
+PHP_FUNCTION(odbc_procedures);
+PHP_FUNCTION(odbc_procedurecolumns);
+#endif
+PHP_FUNCTION(odbc_gettypeinfo);
+PHP_FUNCTION(odbc_primarykeys);
+PHP_FUNCTION(odbc_specialcolumns);
+PHP_FUNCTION(odbc_statistics);
+
+#else
+
+#define odbc_module_ptr NULL
+
+#endif /* HAVE_UODBC */
+
+#define phpext_odbc_ptr odbc_module_ptr
+
+#endif /* PHP_ODBC_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h
new file mode 100644
index 0000000..8251528
--- /dev/null
+++ b/ext/odbc/php_odbc_includes.h
@@ -0,0 +1,305 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2013 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Stig Sæther Bakken <ssb@php.net>                            |
+   |          Andreas Karajannis <Andreas.Karajannis@gmd.de>              |
+   |	      Kevin N. Shallow <kshallow@tampabay.rr.com> (Birdstep)      |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef PHP_ODBC_INCLUDES_H
+#define PHP_ODBC_INCLUDES_H
+
+#if HAVE_UODBC
+
+#define ODBCVER 0x0250
+/*#ifndef MSVC5
+#define FAR
+#endif
+*/
+
+/* checking in the same order as in configure.in */
+
+#if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) || defined(HAVE_SOLID_35) /* Solid Server */
+
+#define ODBC_TYPE "Solid"
+#if defined(HAVE_SOLID)
+# include <cli0core.h>
+# include <cli0ext1.h>
+# include <cli0env.h>
+#elif defined(HAVE_SOLID_30)
+# include <cli0cli.h>
+# include <cli0defs.h>
+# include <cli0env.h>
+#elif defined(HAVE_SOLID_35)
+# if !defined(PHP_WIN32)
+#  include <sqlunix.h>
+# endif		/* end: #if !defined(PHP_WIN32) */
+# include <sqltypes.h>
+# include <sqlucode.h>
+# include <sqlext.h>
+# include <sql.h>
+#endif	/* end: #if defined(HAVE_SOLID) */
+#undef HAVE_SQL_EXTENDED_FETCH
+PHP_FUNCTION(solid_fetch_prev);
+#define SQLSMALLINT SWORD
+#define SQLUSMALLINT UWORD
+#ifndef SQL_SUCCEEDED
+#define SQL_SUCCEEDED(rc) (((rc)&(~1))==0)
+#endif
+
+#elif defined(HAVE_EMPRESS) /* Empress */
+
+#define ODBC_TYPE "Empress"
+#include <sql.h>
+#include <sqlext.h>
+#undef HAVE_SQL_EXTENDED_FETCH
+
+#elif defined(HAVE_ADABAS) /* Adabas D */
+
+#define ODBC_TYPE "Adabas D"
+#include <WINDOWS.H>
+#include <sql.h>
+#include <sqlext.h>
+#define HAVE_SQL_EXTENDED_FETCH 1
+#define SQL_SUCCEEDED(rc) (((rc)&(~1))==0)
+#define SQLINTEGER ULONG
+#define SQLUSMALLINT USHORT
+
+#elif defined(HAVE_SAPDB) /* SAP DB */
+
+#define ODBC_TYPE "SAP DB"
+#include <WINDOWS.H>
+#include <sql.h>
+#include <sqlext.h>
+#define HAVE_SQL_EXTENDED_FETCH 1
+#define SQL_SUCCEEDED(rc) (((rc)&(~1))==0)
+
+#elif defined(HAVE_IODBC) /* iODBC library */
+
+#ifdef CHAR
+#undef CHAR
+#endif
+
+#ifdef SQLCHAR
+#undef SQLCHAR
+#endif
+
+#define ODBC_TYPE "iODBC"
+#include <sql.h>
+#include <sqlext.h>
+#include <iodbcext.h>
+#define HAVE_SQL_EXTENDED_FETCH 1
+
+#elif defined(HAVE_UNIXODBC) /* unixODBC library */
+
+#ifdef CHAR
+#undef CHAR
+#endif
+
+#ifdef SQLCHAR
+#undef SQLCHAR
+#endif
+
+#define ODBC_TYPE "unixODBC"
+#include <sql.h>
+#include <sqlext.h>
+#define HAVE_SQL_EXTENDED_FETCH 1
+
+#elif defined(HAVE_ESOOB) /* Easysoft ODBC-ODBC Bridge library */
+
+#define ODBC_TYPE "ESOOB"
+#include <sql.h>
+#include <sqlext.h>
+#define HAVE_SQL_EXTENDED_FETCH 1
+
+#elif defined(HAVE_ODBC_ROUTER) /* ODBCRouter.com */
+
+#ifdef CHAR
+#undef CHAR
+#endif
+
+#ifdef SQLCHAR
+#undef SQLCHAR
+#endif
+
+#define ODBC_TYPE "ODBCRouter"
+#include <odbcsdk.h>
+#undef HAVE_SQL_EXTENDED_FETCH
+
+#elif defined(HAVE_OPENLINK) /* OpenLink ODBC drivers */
+
+#define ODBC_TYPE "Openlink"
+#include <iodbc.h>
+#include <isql.h>
+#include <isqlext.h>
+#include <udbcext.h>
+#define HAVE_SQL_EXTENDED_FETCH 1
+#ifndef SQLSMALLINT
+#define SQLSMALLINT SWORD
+#endif
+#ifndef SQLUSMALLINT
+#define SQLUSMALLINT UWORD
+#endif
+
+#elif defined(HAVE_BIRDSTEP) /* Raima Birdstep */
+
+#define ODBC_TYPE "Birdstep"
+#define UNIX
+/*
+ * Extended Fetch in the Birdstep ODBC API is incapable of returning long varchar (memo) fields.
+ * So the following line has been commented-out to accomadate. - KNS
+ *
+ * #define HAVE_SQL_EXTENDED_FETCH 1
+ */
+#include <sql.h>
+#include <sqlext.h>
+#define SQLINTEGER SDWORD
+#define SQLSMALLINT SWORD
+#define SQLUSMALLINT UWORD
+
+
+#elif defined(HAVE_DBMAKER) /* DBMaker */
+
+#define ODBC_TYPE "DBMaker"
+#undef ODBCVER
+#define ODBCVER 0x0300
+#define HAVE_SQL_EXTENDED_FETCH 1
+#include <odbc.h>
+
+
+#elif defined(HAVE_CODBC) /* Custom ODBC */
+
+#define ODBC_TYPE "Custom ODBC"
+#define HAVE_SQL_EXTENDED_FETCH 1
+#include <odbc.h>
+
+#elif defined(HAVE_IBMDB2) /* DB2 CLI */
+
+#define ODBC_TYPE "IBM DB2 CLI"
+#define HAVE_SQL_EXTENDED_FETCH 1
+#include <sqlcli1.h>
+#ifdef DB268K
+/* Need to include ASLM for 68K applications */
+#include <LibraryManager.h>
+#endif
+
+#else /* MS ODBC */
+
+#define HAVE_SQL_EXTENDED_FETCH 1
+#include <WINDOWS.H>
+#include <sql.h>
+#include <sqlext.h>
+#endif
+
+
+/* Common defines */
+
+#if defined( HAVE_IBMDB2 ) || defined( HAVE_UNIXODBC ) || defined (HAVE_IODBC)
+#define ODBC_SQL_ENV_T SQLHANDLE
+#define ODBC_SQL_CONN_T SQLHANDLE
+#define ODBC_SQL_STMT_T SQLHANDLE
+#elif defined( HAVE_SOLID_35 ) || defined( HAVE_SAPDB ) || defined ( HAVE_EMPRESS )
+#define ODBC_SQL_ENV_T SQLHENV
+#define ODBC_SQL_CONN_T SQLHDBC
+#define ODBC_SQL_STMT_T SQLHSTMT
+#else
+#define ODBC_SQL_ENV_T HENV
+#define ODBC_SQL_CONN_T HDBC
+#define ODBC_SQL_STMT_T HSTMT
+#endif
+
+typedef struct odbc_connection {
+    ODBC_SQL_ENV_T henv;
+    ODBC_SQL_CONN_T hdbc;
+    char laststate[6];
+    char lasterrormsg[SQL_MAX_MESSAGE_LENGTH];
+	int id;
+	int persistent;
+} odbc_connection;
+
+typedef struct odbc_result_value {
+	char name[32];
+	char *value;
+	SQLLEN vallen;
+	SQLLEN coltype;
+} odbc_result_value;
+
+typedef struct odbc_result {
+	ODBC_SQL_STMT_T stmt;
+	odbc_result_value *values;
+	SQLSMALLINT numcols;
+	SQLSMALLINT numparams;
+# if HAVE_SQL_EXTENDED_FETCH
+	int fetch_abs;
+# endif
+	long longreadlen;
+	int binmode;
+	int fetched;
+	odbc_connection *conn_ptr;
+} odbc_result;
+
+ZEND_BEGIN_MODULE_GLOBALS(odbc)
+	char *defDB;
+	char *defUser;
+	char *defPW;
+	long allow_persistent;
+	long check_persistent;
+	long max_persistent;
+	long max_links;
+	long num_persistent;
+	long num_links;
+	int defConn;
+    long defaultlrl;
+    long defaultbinmode;
+    long default_cursortype;
+    char laststate[6];
+    char lasterrormsg[SQL_MAX_MESSAGE_LENGTH];
+	HashTable *resource_list;
+	HashTable *resource_plist;
+ZEND_END_MODULE_GLOBALS(odbc)
+
+int odbc_add_result(HashTable *list, odbc_result *result);
+odbc_result *odbc_get_result(HashTable *list, int count);
+void odbc_del_result(HashTable *list, int count);
+int odbc_add_conn(HashTable *list, HDBC conn);
+odbc_connection *odbc_get_conn(HashTable *list, int count);
+void odbc_del_conn(HashTable *list, int ind);
+int odbc_bindcols(odbc_result *result TSRMLS_DC);
+
+#define ODBC_SQL_ERROR_PARAMS odbc_connection *conn_resource, ODBC_SQL_STMT_T stmt, char *func
+
+void odbc_sql_error(ODBC_SQL_ERROR_PARAMS);
+
+#define IS_SQL_LONG(x) (x == SQL_LONGVARBINARY || x == SQL_LONGVARCHAR)
+#define IS_SQL_BINARY(x) (x == SQL_BINARY || x == SQL_VARBINARY || x == SQL_LONGVARBINARY)
+
+#ifdef ZTS
+# define ODBCG(v) TSRMG(odbc_globals_id, zend_odbc_globals *, v)
+#else
+# define ODBCG(v) (odbc_globals.v)
+extern ZEND_API zend_odbc_globals odbc_globals;
+#endif
+
+#endif /* HAVE_UODBC */
+#endif /* PHP_ODBC_INCLUDES_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
diff --git a/ext/odbc/tests/config.inc b/ext/odbc/tests/config.inc
new file mode 100644
index 0000000..a88eea4
--- /dev/null
+++ b/ext/odbc/tests/config.inc
@@ -0,0 +1,8 @@
+<?php
+
+putenv('ODBCINI=/etc/odbc.ini');
+putenv('ODBCSYSINI=/etc');
+
+$dsn = 'myodbc3';
+$user = 'root';
+$pass = '';
diff --git a/ext/odbc/tests/odbc_columnprivileges_001.phpt b/ext/odbc/tests/odbc_columnprivileges_001.phpt
new file mode 100644
index 0000000..062985d
--- /dev/null
+++ b/ext/odbc/tests/odbc_columnprivileges_001.phpt
@@ -0,0 +1,28 @@
+--TEST--
+odbc_columnprivileges(): Basic test
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
+--FILE--
+<?php
+
+include 'config.inc';
+
+$conn = odbc_connect($dsn, $user, $pass);
+
+var_dump($result = odbc_columnprivileges($conn, '', '', '', ''));
+var_dump(odbc_fetch_row($result));
+
+var_dump($result = odbc_columnprivileges($conn, NULL, NULL, NULL, NULL));
+var_dump(odbc_fetch_row($result));
+
+var_dump($result = odbc_columnprivileges($conn, 'FOO', 'FOO', 'FOO', 'FOO'));
+var_dump(odbc_fetch_row($result));
+
+?>
+--EXPECTF--
+resource(%d) of type (odbc result)
+bool(false)
+resource(%d) of type (odbc result)
+bool(false)
+resource(%d) of type (odbc result)
+bool(false)
diff --git a/ext/odbc/tests/odbc_columns_001.phpt b/ext/odbc/tests/odbc_columns_001.phpt
new file mode 100644
index 0000000..f6da78e
--- /dev/null
+++ b/ext/odbc/tests/odbc_columns_001.phpt
@@ -0,0 +1,32 @@
+--TEST--
+odbc_columns(): Basic test
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
+--FILE--
+<?php
+
+include 'config.inc';
+
+$conn = odbc_connect($dsn, $user, $pass);
+
+var_dump($result = odbc_columns($conn, '', '', '', ''));
+var_dump(odbc_fetch_row($result));
+
+var_dump($result = odbc_columns($conn, NULL, NULL, NULL, NULL));
+var_dump(odbc_fetch_row($result));
+
+var_dump($result = odbc_columns($conn, 'FOO', 'FOO', 'FOO', 'FOO'));
+var_dump(odbc_fetch_row($result));
+
+?>
+--EXPECTF--
+resource(%d) of type (odbc result)
+bool(false)
+resource(%d) of type (odbc result)
+bool(false)
+
+Warning: odbc_columns(): SQL error: Failed to fetch error message, SQL state HY000 in SQLColumns in %s on line %d
+bool(false)
+
+Warning: odbc_fetch_row() expects parameter 1 to be resource, boolean given in %s on line %d
+NULL
diff --git a/ext/odbc/tests/odbc_data_source_001.phpt b/ext/odbc/tests/odbc_data_source_001.phpt
new file mode 100644
index 0000000..17a826f
--- /dev/null
+++ b/ext/odbc/tests/odbc_data_source_001.phpt
@@ -0,0 +1,25 @@
+--TEST--
+odbc_data_source(): Basic test
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
+--FILE--
+<?php
+
+include 'config.inc';
+
+$conn = odbc_connect($dsn, $user, $pass);
+
+var_dump(odbc_data_source($conn, NULL));
+var_dump(odbc_data_source($conn, ''));
+var_dump(odbc_data_source($conn, SQL_FETCH_FIRST));
+
+?>
+--EXPECTF--
+Warning: odbc_data_source(): Invalid fetch type (0) in %s on line %d
+bool(false)
+
+Warning: odbc_data_source() expects parameter 2 to be long, string given in %s on line %d
+NULL
+array(%d) {
+%a
+}
diff --git a/ext/odbc/tests/odbc_exec_001.phpt b/ext/odbc/tests/odbc_exec_001.phpt
new file mode 100644
index 0000000..c525a96
--- /dev/null
+++ b/ext/odbc/tests/odbc_exec_001.phpt
@@ -0,0 +1,40 @@
+--TEST--
+odbc_exec(): Basic test
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
+--FILE--
+<?php
+
+include 'config.inc';
+
+$conn = odbc_connect($dsn, $user, $pass);
+
+odbc_exec($conn, 'foo', 'bar');
+odbc_exec($conn, 'foo');
+
+odbc_exec($conn, '', '');
+odbc_exec($conn, '');
+
+odbc_exec($conn, 1, 1);
+odbc_exec($conn, 1);
+
+odbc_exec($conn, NULL, NULL);
+odbc_exec($conn, NULL);
+
+?>
+--EXPECTF--
+Warning: odbc_exec() expects parameter 3 to be long, %unicode_string_optional% given in %s on line %d
+
+Warning: odbc_exec(): SQL error: %s in %s on line %d
+
+Warning: odbc_exec() expects parameter 3 to be long, %unicode_string_optional% given in %s on line %d
+
+Warning: odbc_exec(): SQL error: %s in %s on line %d
+
+Warning: odbc_exec(): SQL error: %s in %s on line %d
+
+Warning: odbc_exec(): SQL error: %s in %s on line %d
+
+Warning: odbc_exec(): SQL error: %s in %s on line %d
+
+Warning: odbc_exec(): SQL error: %s in %s on line %d
diff --git a/ext/odbc/tests/odbc_exec_002.phpt b/ext/odbc/tests/odbc_exec_002.phpt
new file mode 100644
index 0000000..8f9672d
--- /dev/null
+++ b/ext/odbc/tests/odbc_exec_002.phpt
@@ -0,0 +1,36 @@
+--TEST--
+odbc_exec(): Getting data from query
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
+--FILE--
+<?php
+
+include 'config.inc';
+
+$conn = odbc_connect($dsn, $user, $pass);
+
+odbc_exec($conn, 'CREATE DATABASE odbcTEST');
+
+odbc_exec($conn, 'CREATE TABLE FOO (TEST INT)');
+
+odbc_exec($conn, 'INSERT INTO FOO VALUES (1)');
+odbc_exec($conn, 'INSERT INTO FOO VALUES (2)');
+
+$res = odbc_exec($conn, 'SELECT * FROM FOO');
+
+var_dump(odbc_fetch_row($res));
+var_dump(odbc_result($res, 'test'));
+var_dump(odbc_fetch_array($res));
+
+odbc_exec($conn, 'DROP TABLE FOO');
+
+odbc_exec($conn, 'DROP DATABASE odbcTEST');
+
+?>
+--EXPECTF--
+bool(true)
+string(1) "1"
+array(1) {
+  ["TEST"]=>
+  string(1) "2"
+}
diff --git a/ext/odbc/tests/odbc_free_result_001.phpt b/ext/odbc/tests/odbc_free_result_001.phpt
new file mode 100644
index 0000000..4fcd5cd
--- /dev/null
+++ b/ext/odbc/tests/odbc_free_result_001.phpt
@@ -0,0 +1,50 @@
+--TEST--
+odbc_free_result(): Basic test
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
+--FILE--
+<?php
+
+include 'config.inc';
+
+$conn = odbc_connect($dsn, $user, $pass);
+
+odbc_exec($conn, 'CREATE DATABASE odbcTEST');
+
+odbc_exec($conn, 'CREATE TABLE FOO (TEST INT)');
+odbc_exec($conn, 'ALTER TABLE FOO ADD PRIMARY KEY FOO(TEST)');
+
+odbc_exec($conn, 'INSERT INTO FOO VALUES (1)');
+odbc_exec($conn, 'INSERT INTO FOO VALUES (2)');
+
+$res = odbc_exec($conn, 'SELECT * FROM FOO');
+
+var_dump(odbc_fetch_row($res));
+var_dump(odbc_result($res, 'test'));
+var_dump(odbc_free_result($res));
+var_dump(odbc_free_result($conn));
+var_dump(odbc_free_result(NULL));
+var_dump(odbc_fetch_row($res));
+var_dump(odbc_result($res, 'test'));
+
+odbc_exec($conn, 'DROP TABLE FOO');
+
+odbc_exec($conn, 'DROP DATABASE odbcTEST');
+
+?>
+--EXPECTF--
+bool(true)
+string(1) "1"
+bool(true)
+
+Warning: odbc_free_result(): supplied resource is not a valid ODBC result resource in %s on line %d
+bool(false)
+
+Warning: odbc_free_result() expects parameter 1 to be resource, null given in %s on line %d
+NULL
+
+Warning: odbc_fetch_row(): %d is not a valid ODBC result resource in %s on line %d
+bool(false)
+
+Warning: odbc_result(): %d is not a valid ODBC result resource in %s on line %d
+bool(false)
diff --git a/ext/odbc/tests/odbc_tables_001.phpt b/ext/odbc/tests/odbc_tables_001.phpt
new file mode 100644
index 0000000..6b922f2
--- /dev/null
+++ b/ext/odbc/tests/odbc_tables_001.phpt
@@ -0,0 +1,29 @@
+--TEST--
+odbc_tables(): Basic test
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
+--FILE--
+<?php
+
+include 'config.inc';
+
+$conn = odbc_connect($dsn, $user, $pass);
+
+var_dump($result = odbc_tables($conn, '', '', '', ''));
+var_dump(odbc_fetch_row($result));
+
+var_dump($result = odbc_tables($conn, NULL, NULL, NULL, NULL));
+var_dump(odbc_fetch_row($result));
+
+var_dump($result = odbc_tables($conn, 'FOO', 'FOO', 'FOO', 'FOO'));
+var_dump(odbc_fetch_row($result));
+
+
+?>
+--EXPECTF--
+resource(%d) of type (odbc result)
+bool(false)
+resource(%d) of type (odbc result)
+bool(false)
+resource(%d) of type (odbc result)
+bool(false)
diff --git a/ext/odbc/tests/skipif.inc b/ext/odbc/tests/skipif.inc
new file mode 100644
index 0000000..179a5b1
--- /dev/null
+++ b/ext/odbc/tests/skipif.inc
@@ -0,0 +1,10 @@
+<?php
+
+if (!extension_loaded('odbc')) die('skip');
+
+include 'config.inc';
+
+$conn = @odbc_connect($dsn, $user, $pass);
+if (!$conn) {
+	die('skip could not connect');
+}