cvs: php3 / ChangeLog configure.in /functions/ oci8.c

thies Thu May 25 09:59:07 2000 EDT Modified files: /php3 ChangeLog configure.in /php3/functions oci8.c Log: improved checks for oracle 8i outstanding oci8 transactions are now rolled back on connection close Index: php3/ChangeLog diff -u php3/ChangeLog:1.839 php3/ChangeLog:1.840 --- php3/ChangeLog:1.839 Wed Apr 19 22:04:03 2000 +++ php3/ChangeLog Thu May 25 09:59:06 2000 @@ -2,6 +2,9 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?, 200x, Version 3.0.17 +- Uncommitted outstanding OCI8 transactions are now rolled back + before the connection is closed. (Thies) +- Improved configure checks for Oracle 8i. (Thies) - Added imap_mime_header_decode() function (Skalski) April 05, 2000, Version 3.0.16 Index: php3/configure.in diff -u php3/configure.in:1.503 php3/configure.in:1.504 --- php3/configure.in:1.503 Mon May 15 19:14:27 2000 +++ php3/configure.in Thu May 25 09:59:06 2000 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.503 2000/05/15 17:14:27 sas Exp $ +dnl $Id: configure.in,v 1.504 2000/05/25 07:59:06 thies Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -1150,25 +1150,19 @@ # Oracle include files - if test -f "$ORACLEINST_TOP/rdbms/public/ocidfn.h" - then - # V8.0.5 + if test -d "$ORACLEINST_TOP/rdbms/public"; then ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/rdbms/public" - elif test -f "$ORACLEINST_TOP/rdbms/demo/ocidfn.h" - then - # V7.[0123] - ORACLE_INCLUDE=-I$ORACLEINST_TOP/rdbms/demo + fi + + if test -d "$ORACLEINST_TOP/rdbms/demo/";then + ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/rdbms/demo" fi - if test -d "$ORACLEINST_TOP/network/public" - then - # V8 + if test -d "$ORACLEINST_TOP/network/public"; then ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/network/public" fi - if test -d "$ORACLEINST_TOP/plsql/public" - then - # V8 + if test -d "$ORACLEINST_TOP/plsql/public"; then ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/plsql/public" fi Index: php3/functions/oci8.c diff -u php3/functions/oci8.c:1.132 php3/functions/oci8.c:1.133 --- php3/functions/oci8.c:1.132 Thu Mar 23 10:20:33 2000 +++ php3/functions/oci8.c Thu May 25 09:59:06 2000 @@ -33,7 +33,7 @@ #define OCI8_USE_EMALLOC 0 /* set this to 1 if you want to use the php memory manager! */ -/* $Id: oci8.c,v 1.132 2000/03/23 09:20:33 thies Exp $ */ +/* $Id: oci8.c,v 1.133 2000/05/25 07:59:06 thies Exp $ */ /* TODO list: * @@ -634,6 +634,15 @@ } if (connection->pServiceContext) { + connection->error = + OCITransRollback(connection->pServiceContext, + connection->pError, + (ub4)0); + + if (connection->error) { + oci8_error(connection->pError, "failed to rollback outstanding transactions!", connection->error); + } + OCIHandleFree((dvoid *) connection->pServiceContext, (ub4) OCI_HTYPE_SVCCTX); }