cvs: pecl /ingres CHANGELOG ii.c package.xml
| From: | Grant Croker | Date: | Mon, 18 Dec 2006 15:37:04 +0000 |
| Subject: | cvs: pecl /ingres CHANGELOG ii.c package.xml | ||
| Groups: | php.pecl.cvs | ||
| Request: | Send a blank email to pecl-cvs+get-6805@lists.php.net to get a copy of this message | ||
grantc Mon Dec 18 15:37:04 2006 UTC
Modified files:
/pecl/ingres ii.c CHANGELOG package.xml
Log:
Added environment sanity check
http://cvs.php.net/viewvc.cgi/pecl/ingres/ii.c?r1=1.85&r2=1.86&diff_format=u Index: pecl/ingres/ii.c diff -u pecl/ingres/ii.c:1.85 pecl/ingres/ii.c:1.86 --- pecl/ingres/ii.c:1.85 Wed Dec 13 18:04:31 2006 +++ pecl/ingres/ii.c Mon Dec 18 15:37:04 2006 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ii.c,v 1.85 2006/12/13 18:04:31 grantc Exp $ */ +/* $Id: ii.c,v 1.86 2006/12/18 15:37:04 grantc Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -384,43 +384,54 @@ */ PHP_MINIT_FUNCTION(ii) { - - ZEND_INIT_MODULE_GLOBALS(ii, php_ii_globals_init, php_ii_globals_shutdown); - REGISTER_INI_ENTRIES(); - le_ii_link = zend_register_list_destructors_ex(php_close_ii_link, NULL, "ingres", module_number); - le_ii_plink = zend_register_list_destructors_ex(_clean_ii_plink, _close_ii_plink, "ingres persistent", module_number); + /* Sanity check */ + /* prevent module from loading if environment is not properly setup */ + if ( getenv("II_SYSTEM") != NULL ) + { + + ZEND_INIT_MODULE_GLOBALS(ii, php_ii_globals_init, php_ii_globals_shutdown); + REGISTER_INI_ENTRIES(); - /* Constants registration */ - REGISTER_LONG_CONSTANT("INGRES_ASSOC", II_ASSOC, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_NUM", II_NUM, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_BOTH", II_BOTH, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_EXT_VERSION", II_VERSION, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_API_VERSION", IIAPI_VERSION, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_CURSOR_READONLY", II_CURSOR_READONLY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_CURSOR_UPDATE", II_CURSOR_UPDATE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_US", II_DATE_US, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_MULTINATIONAL", II_DATE_MULTINATIONAL, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_MULTINATIONAL4", II_DATE_MULTINATIONAL4, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_FINNISH", II_DATE_FINNISH, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_ISO", II_DATE_ISO, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_ISO4", II_DATE_ISO4, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_GERMAN", II_DATE_GERMAN, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_MDY", II_DATE_MDY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_DMY", II_DATE_DMY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_YMD", II_DATE_YMD, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_MONEY_LEADING", II_MONEY_LEAD_SIGN, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_MONEY_TRAILING", II_MONEY_TRAIL_SIGN, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_ISAM", II_STRUCTURE_ISAM, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CISAM", II_STRUCTURE_CISAM, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_BTREE", II_STRUCTURE_BTREE, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CTREE", II_STRUCTURE_CBTREE, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_HASH", II_STRUCTURE_HASH, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CHASH", II_STRUCTURE_CHASH, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_HEAP", II_STRUCTURE_HEAP, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CHEAP", II_STRUCTURE_CHEAP, CONST_CS | CONST_PERSISTENT); + le_ii_link = zend_register_list_destructors_ex(php_close_ii_link, NULL, "ingres", module_number); + le_ii_plink = zend_register_list_destructors_ex(_clean_ii_plink, _close_ii_plink, "ingres persistent", module_number); - return SUCCESS; + /* Constants registration */ + REGISTER_LONG_CONSTANT("INGRES_ASSOC", II_ASSOC, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_NUM", II_NUM, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_BOTH", II_BOTH, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_EXT_VERSION", II_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_API_VERSION", IIAPI_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_CURSOR_READONLY", II_CURSOR_READONLY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_CURSOR_UPDATE", II_CURSOR_UPDATE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_US", II_DATE_US, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_MULTINATIONAL", II_DATE_MULTINATIONAL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_MULTINATIONAL4", II_DATE_MULTINATIONAL4, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_FINNISH", II_DATE_FINNISH, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_ISO", II_DATE_ISO, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_ISO4", II_DATE_ISO4, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_GERMAN", II_DATE_GERMAN, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_MDY", II_DATE_MDY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_DMY", II_DATE_DMY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_YMD", II_DATE_YMD, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_MONEY_LEADING", II_MONEY_LEAD_SIGN, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_MONEY_TRAILING", II_MONEY_TRAIL_SIGN, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_ISAM", II_STRUCTURE_ISAM, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CISAM", II_STRUCTURE_CISAM, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_BTREE", II_STRUCTURE_BTREE, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CTREE", II_STRUCTURE_CBTREE, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_HASH", II_STRUCTURE_HASH, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CHASH", II_STRUCTURE_CHASH, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_HEAP", II_STRUCTURE_HEAP, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CHEAP", II_STRUCTURE_CHEAP, CONST_CS | CONST_PERSISTENT); + + return SUCCESS; + } + else + { + php_error_docref(NULL TSRMLS_CC, E_ERROR, "II_SYSTEM is not defined" ); + return FAILURE; + } } /* }}} */ @@ -512,7 +523,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Ingres Support", "enabled"); php_info_print_table_row(2, "Ingres Extension Version", II_VERSION); - php_info_print_table_row(2, "Revision", "$Revision: 1.85 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.86 $"); sprintf(buf, "%ld", IIAPI_VERSION ); php_info_print_table_row(2, "Ingres OpenAPI Version", buf); sprintf(buf, "%ld", IIG(num_persistent)); @@ -556,10 +567,6 @@ static int ii_success(IIAPI_GENPARM *genParm, II_LINK *ii_link TSRMLS_DC) { IIAPI_GETEINFOPARM *error_info; - char * no_message; - - no_message = emalloc(1); - sprintf(no_message,"\0"); /* Initialise global variables */ IIG(errorCode) = 0; @@ -582,8 +589,6 @@ } } - efree(no_message); - switch (genParm->gp_status) { http://cvs.php.net/viewvc.cgi/pecl/ingres/CHANGELOG?r1=1.27&r2=1.28&diff_format=u Index: pecl/ingres/CHANGELOG diff -u pecl/ingres/CHANGELOG:1.27 pecl/ingres/CHANGELOG:1.28 --- pecl/ingres/CHANGELOG:1.27 Wed Dec 13 18:04:31 2006 +++ pecl/ingres/CHANGELOG Mon Dec 18 15:37:04 2006 @@ -1,4 +1,5 @@ -CVS +version 1.4.1 +- Added environment check during initialization [grantc 18-12-06] - Fixed SEGV when closing a statement [grantc 13-12-06] - Fixed spurious E_WARNING with empty LOB dataset [grantc 13-12-06] - Fixed SEGV when ingres_close() is not called [grantc 13-12-06] http://cvs.php.net/viewvc.cgi/pecl/ingres/package.xml?r1=1.17&r2=1.18&diff_format=u Index: pecl/ingres/package.xml diff -u pecl/ingres/package.xml:1.17 pecl/ingres/package.xml:1.18 --- pecl/ingres/package.xml:1.17 Wed Nov 8 08:12:07 2006 +++ pecl/ingres/package.xml Mon Dec 18 15:37:04 2006 @@ -14,8 +14,8 @@ <email>grant.croker@ingres.com</email> <active>yes</active> </lead> - <date>2006-11-08</date> - <time>09:00:00</time> + <date>2006-12-18</date> + <time>17:00:00</time> <version> <release>1.4.1</release> <api>1.4.1</api> @@ -25,26 +25,14 @@ <api>beta</api> </stability> <license uri="http://www.php.net/license">PHP</license> - <notes>This release adds the folllowing ini settings: - - ingres.timeout - connection timeout. Either add ingres.timeout=<some value in ms> to php.ini or call ini_set("ingres.timeout",<some value in ms>) within the php script. A value of -1 implies no timeout. - - ingres.array_index_start - overide the default start value for the index of an array. Default is 1. - -The following changes were submitted: -- Added missing constants for table structures [grantc 20-10-06] -- Fixed SEGV during shutdown when TSRM enabled [grantc 02-10-06] -- Fixed several SEGVs when working with parameters [grantc 02-10-06] -- Added support for Unicode (UTF-16) insertion and retrieval [grantc 15-08-06] -- Added support for updating/inserting LOBS [grantc 04-07-06] -- blob_segment_length is now picked up without using ingres_connect option -parameter [grantc 04-07-06] -- Changed startup to initialize OpenAPI per request [grantc 04-07-06] -- Fixed SEGV when using error reporting functions [grantc 28-04-06] -- Fixed Array so the start index is 1 (original default) and not 0 [grantc 07-04-06] -- Added ini setting ingres.array_index_start to overide default start index of 1 [grantc 07-04-06] -- Fixed crash on module unload [grantc 22-03-06] -- Added support for parameter typing to match PHP data to Ingres types [grantc 28-11-05] -- Added preliminary UTF-16 support [grantc 28-11-05] -- Added global to configure connection timeout [grantc 15-12-05] + <notes>The following changes were submitted: + - Added environment check during initialization [grantc 18-12-06] + - Fixed SEGV when closing a statement [grantc 13-12-06] + - Fixed spurious E_WARNING with empty LOB dataset [grantc 13-12-06] + - Fixed SEGV when ingres_close() is not called [grantc 13-12-06] + - Fixed auto commit cannot be enabled on shutdown [grantc 27-11-06] + - Fixed Array index start for php_ii_field_name [grantc 20-11-06] + - Fixed constant typo [grantc 22-10-06] </notes> <contents> <dir name="/">
http://cvs.php.net/viewvc.cgi/pecl/ingres/ii.c?r1=1.85&r2=1.86&diff_format=u Index: pecl/ingres/ii.c diff -u pecl/ingres/ii.c:1.85 pecl/ingres/ii.c:1.86 --- pecl/ingres/ii.c:1.85 Wed Dec 13 18:04:31 2006 +++ pecl/ingres/ii.c Mon Dec 18 15:37:04 2006 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ii.c,v 1.85 2006/12/13 18:04:31 grantc Exp $ */ +/* $Id: ii.c,v 1.86 2006/12/18 15:37:04 grantc Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -384,43 +384,54 @@ */ PHP_MINIT_FUNCTION(ii) { - - ZEND_INIT_MODULE_GLOBALS(ii, php_ii_globals_init, php_ii_globals_shutdown); - REGISTER_INI_ENTRIES(); - le_ii_link = zend_register_list_destructors_ex(php_close_ii_link, NULL, "ingres", module_number); - le_ii_plink = zend_register_list_destructors_ex(_clean_ii_plink, _close_ii_plink, "ingres persistent", module_number); + /* Sanity check */ + /* prevent module from loading if environment is not properly setup */ + if ( getenv("II_SYSTEM") != NULL ) + { + + ZEND_INIT_MODULE_GLOBALS(ii, php_ii_globals_init, php_ii_globals_shutdown); + REGISTER_INI_ENTRIES(); - /* Constants registration */ - REGISTER_LONG_CONSTANT("INGRES_ASSOC", II_ASSOC, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_NUM", II_NUM, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_BOTH", II_BOTH, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_EXT_VERSION", II_VERSION, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_API_VERSION", IIAPI_VERSION, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_CURSOR_READONLY", II_CURSOR_READONLY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_CURSOR_UPDATE", II_CURSOR_UPDATE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_US", II_DATE_US, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_MULTINATIONAL", II_DATE_MULTINATIONAL, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_MULTINATIONAL4", II_DATE_MULTINATIONAL4, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_FINNISH", II_DATE_FINNISH, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_ISO", II_DATE_ISO, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_ISO4", II_DATE_ISO4, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_GERMAN", II_DATE_GERMAN, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_MDY", II_DATE_MDY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_DMY", II_DATE_DMY, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_DATE_YMD", II_DATE_YMD, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_MONEY_LEADING", II_MONEY_LEAD_SIGN, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("INGRES_MONEY_TRAILING", II_MONEY_TRAIL_SIGN, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_ISAM", II_STRUCTURE_ISAM, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CISAM", II_STRUCTURE_CISAM, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_BTREE", II_STRUCTURE_BTREE, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CTREE", II_STRUCTURE_CBTREE, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_HASH", II_STRUCTURE_HASH, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CHASH", II_STRUCTURE_CHASH, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_HEAP", II_STRUCTURE_HEAP, CONST_CS | CONST_PERSISTENT); - REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CHEAP", II_STRUCTURE_CHEAP, CONST_CS | CONST_PERSISTENT); + le_ii_link = zend_register_list_destructors_ex(php_close_ii_link, NULL, "ingres", module_number); + le_ii_plink = zend_register_list_destructors_ex(_clean_ii_plink, _close_ii_plink, "ingres persistent", module_number); - return SUCCESS; + /* Constants registration */ + REGISTER_LONG_CONSTANT("INGRES_ASSOC", II_ASSOC, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_NUM", II_NUM, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_BOTH", II_BOTH, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_EXT_VERSION", II_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_API_VERSION", IIAPI_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_CURSOR_READONLY", II_CURSOR_READONLY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_CURSOR_UPDATE", II_CURSOR_UPDATE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_US", II_DATE_US, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_MULTINATIONAL", II_DATE_MULTINATIONAL, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_MULTINATIONAL4", II_DATE_MULTINATIONAL4, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_FINNISH", II_DATE_FINNISH, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_ISO", II_DATE_ISO, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_ISO4", II_DATE_ISO4, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_GERMAN", II_DATE_GERMAN, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_MDY", II_DATE_MDY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_DMY", II_DATE_DMY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_DATE_YMD", II_DATE_YMD, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_MONEY_LEADING", II_MONEY_LEAD_SIGN, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("INGRES_MONEY_TRAILING", II_MONEY_TRAIL_SIGN, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_ISAM", II_STRUCTURE_ISAM, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CISAM", II_STRUCTURE_CISAM, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_BTREE", II_STRUCTURE_BTREE, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CTREE", II_STRUCTURE_CBTREE, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_HASH", II_STRUCTURE_HASH, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CHASH", II_STRUCTURE_CHASH, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_HEAP", II_STRUCTURE_HEAP, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("INGRES_STRUCTURE_CHEAP", II_STRUCTURE_CHEAP, CONST_CS | CONST_PERSISTENT); + + return SUCCESS; + } + else + { + php_error_docref(NULL TSRMLS_CC, E_ERROR, "II_SYSTEM is not defined" ); + return FAILURE; + } } /* }}} */ @@ -512,7 +523,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Ingres Support", "enabled"); php_info_print_table_row(2, "Ingres Extension Version", II_VERSION); - php_info_print_table_row(2, "Revision", "$Revision: 1.85 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.86 $"); sprintf(buf, "%ld", IIAPI_VERSION ); php_info_print_table_row(2, "Ingres OpenAPI Version", buf); sprintf(buf, "%ld", IIG(num_persistent)); @@ -556,10 +567,6 @@ static int ii_success(IIAPI_GENPARM *genParm, II_LINK *ii_link TSRMLS_DC) { IIAPI_GETEINFOPARM *error_info; - char * no_message; - - no_message = emalloc(1); - sprintf(no_message,"\0"); /* Initialise global variables */ IIG(errorCode) = 0; @@ -582,8 +589,6 @@ } } - efree(no_message); - switch (genParm->gp_status) { http://cvs.php.net/viewvc.cgi/pecl/ingres/CHANGELOG?r1=1.27&r2=1.28&diff_format=u Index: pecl/ingres/CHANGELOG diff -u pecl/ingres/CHANGELOG:1.27 pecl/ingres/CHANGELOG:1.28 --- pecl/ingres/CHANGELOG:1.27 Wed Dec 13 18:04:31 2006 +++ pecl/ingres/CHANGELOG Mon Dec 18 15:37:04 2006 @@ -1,4 +1,5 @@ -CVS +version 1.4.1 +- Added environment check during initialization [grantc 18-12-06] - Fixed SEGV when closing a statement [grantc 13-12-06] - Fixed spurious E_WARNING with empty LOB dataset [grantc 13-12-06] - Fixed SEGV when ingres_close() is not called [grantc 13-12-06] http://cvs.php.net/viewvc.cgi/pecl/ingres/package.xml?r1=1.17&r2=1.18&diff_format=u Index: pecl/ingres/package.xml diff -u pecl/ingres/package.xml:1.17 pecl/ingres/package.xml:1.18 --- pecl/ingres/package.xml:1.17 Wed Nov 8 08:12:07 2006 +++ pecl/ingres/package.xml Mon Dec 18 15:37:04 2006 @@ -14,8 +14,8 @@ <email>grant.croker@ingres.com</email> <active>yes</active> </lead> - <date>2006-11-08</date> - <time>09:00:00</time> + <date>2006-12-18</date> + <time>17:00:00</time> <version> <release>1.4.1</release> <api>1.4.1</api> @@ -25,26 +25,14 @@ <api>beta</api> </stability> <license uri="http://www.php.net/license">PHP</license> - <notes>This release adds the folllowing ini settings: - - ingres.timeout - connection timeout. Either add ingres.timeout=<some value in ms> to php.ini or call ini_set("ingres.timeout",<some value in ms>) within the php script. A value of -1 implies no timeout. - - ingres.array_index_start - overide the default start value for the index of an array. Default is 1. - -The following changes were submitted: -- Added missing constants for table structures [grantc 20-10-06] -- Fixed SEGV during shutdown when TSRM enabled [grantc 02-10-06] -- Fixed several SEGVs when working with parameters [grantc 02-10-06] -- Added support for Unicode (UTF-16) insertion and retrieval [grantc 15-08-06] -- Added support for updating/inserting LOBS [grantc 04-07-06] -- blob_segment_length is now picked up without using ingres_connect option -parameter [grantc 04-07-06] -- Changed startup to initialize OpenAPI per request [grantc 04-07-06] -- Fixed SEGV when using error reporting functions [grantc 28-04-06] -- Fixed Array so the start index is 1 (original default) and not 0 [grantc 07-04-06] -- Added ini setting ingres.array_index_start to overide default start index of 1 [grantc 07-04-06] -- Fixed crash on module unload [grantc 22-03-06] -- Added support for parameter typing to match PHP data to Ingres types [grantc 28-11-05] -- Added preliminary UTF-16 support [grantc 28-11-05] -- Added global to configure connection timeout [grantc 15-12-05] + <notes>The following changes were submitted: + - Added environment check during initialization [grantc 18-12-06] + - Fixed SEGV when closing a statement [grantc 13-12-06] + - Fixed spurious E_WARNING with empty LOB dataset [grantc 13-12-06] + - Fixed SEGV when ingres_close() is not called [grantc 13-12-06] + - Fixed auto commit cannot be enabled on shutdown [grantc 27-11-06] + - Fixed Array index start for php_ii_field_name [grantc 20-11-06] + - Fixed constant typo [grantc 22-10-06] </notes> <contents> <dir name="/">