thies Wed Apr 11 08:48:07 2001 EDT Modified files: (Branch: PHP_4_0_5) /php4/ext/oci8 oci8.c Log: MFH - never initialize OCI in OCI_THREADED mode Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.113 php4/ext/oci8/oci8.c:1.113.2.1 --- php4/ext/oci8/oci8.c:1.113 Fri Mar 2 01:12:55 2001 +++ php4/ext/oci8/oci8.c Wed Apr 11 08:48:06 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.113 2001/03/02 09:12:55 thies Exp $ */ +/* $Id: oci8.c,v 1.113.2.1 2001/04/11 15:48:06 thies Exp $ */ /* TODO list: * @@ -342,11 +342,16 @@ { zend_class_entry oci_lob_class_entry; +/* XXX Joe Brown says OCI_THREADED breaks windows, assuming the same is true for unix +- tc #ifdef ZTS #define PHP_OCI_INIT_MODE OCI_THREADED #else +*/ #define PHP_OCI_INIT_MODE OCI_DEFAULT + +/* #endif +*/ #if OCI_USE_EMALLOC OCIInitialize(PHP_OCI_INIT_MODE, NULL, ocimalloc, ocirealloc, ocifree); @@ -489,7 +494,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.113 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.113.2.1 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] To contact the list administrators, e-mail: [EMAIL PROTECTED]