CVS update: php3/functions

Date: Friday February 12, 1999 @ 9:12 Author: thies Update of /repository/php3/functions In directory asf:/u/temp/cvs-serv16053 Modified Files: oci8.c Log Message: some mistake withz OCIFlags initialize oci8 for a threaded environment. doen't harm in a non threaded one - i hope... Index: php3/functions/oci8.c diff -c php3/functions/oci8.c:1.41 php3/functions/oci8.c:1.42 *** php3/functions/oci8.c:1.41 Fri Feb 12 07:21:08 1999 --- php3/functions/oci8.c Fri Feb 12 09:12:08 1999 *************** *** 32,38 **** +----------------------------------------------------------------------+ */ ! /* $Id: oci8.c,v 1.41 1999/02/12 12:21:08 thies Exp $ */ #include "php.h" #include "internal_functions.h" --- 32,38 ---- +----------------------------------------------------------------------+ */ ! /* $Id: oci8.c,v 1.42 1999/02/12 14:12:08 thies Exp $ */ #include "php.h" #include "internal_functions.h" *************** *** 57,62 **** --- 57,63 ---- * - Prefetching control * - support LONG > 64K * - binding of arrays + * - Truncate input values to the bind size???? */ /* {{{ thread safety stuff */ *************** *** 1774,1780 **** continue; } ! if ((column->indicator == -1) && (! statement->conn->flags & OCI_RETURN_NULLS)) { continue; } --- 1775,1782 ---- continue; } ! if ((column->indicator == -1) ! && ((statement->conn->flags & OCI_RETURN_NULLS) == 0)) { continue; } *************** *** 1904,1913 **** } /* Set up the Oracle environment. */ #if OCI8_USE_EMALLOC ! OCIInitialize(OCI_DEFAULT, (dvoid *)connection, ocimalloc, ocirealloc, ocifree); #else ! OCIInitialize(OCI_DEFAULT, NULL, NULL, NULL, NULL); #endif OCIEnvInit(&connection->pEnv, OCI_DEFAULT, 0, NULL); OCIHandleAlloc(connection->pEnv, (dvoid **)&connection->pServiceContext, OCI_HTYPE_SVCCTX, 0, NULL); --- 1906,1918 ---- } /* Set up the Oracle environment. */ + + /* OCI_OBJECT is not supported as of now, but it should not harm!! */ + #if OCI8_USE_EMALLOC ! OCIInitialize((OCI_THREADED | OCI_OBJECT), (dvoid *)connection, ocimalloc, ocirealloc, ocifree); #else ! OCIInitialize((OCI_THREADED | OCI_OBJECT), NULL, NULL, NULL, NULL); #endif OCIEnvInit(&connection->pEnv, OCI_DEFAULT, 0, NULL); OCIHandleAlloc(connection->pEnv, (dvoid **)&connection->pServiceContext, OCI_HTYPE_SVCCTX, 0, NULL); -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net