cvs: php4 /ext/oci8 oci8.c
| From: | Thies C. Arntzen | Date: | Sat, 05 Aug 2000 10:45:56 +0000 |
| Subject: | cvs: php4 /ext/oci8 oci8.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1047@lists.php.net to get a copy of this message | ||
thies Sat Aug 5 03:45:56 2000 EDT
Modified files:
/php4/ext/oci8 oci8.c
Log:
@- Fixed warning when shutting down OCINLogon() connections. (Thies)
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.91 php4/ext/oci8/oci8.c:1.92
--- php4/ext/oci8/oci8.c:1.91 Sat Aug 5 03:07:39 2000
+++ php4/ext/oci8/oci8.c Sat Aug 5 03:45:55 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.91 2000/08/05 10:07:39 thies Exp $ */
+/* $Id: oci8.c,v 1.92 2000/08/05 10:45:55 thies Exp $ */
/* TODO list:
*
@@ -644,12 +644,6 @@
oci_debug("START _oci_conn_list_dtor: id=%d",connection->id);
- if (connection->session && connection->session->exclusive) {
- /* exclusive connection created via OCINLogon() close their
- associated session when destructed */
- zend_list_delete(connection->session->num);
- }
-
if (connection->pServiceContext) {
connection->error =
OCITransRollback(connection->pServiceContext,
@@ -663,6 +657,12 @@
OCIHandleFree((dvoid *) connection->pServiceContext, (ub4) OCI_HTYPE_SVCCTX);
}
+ if (connection->session && connection->session->exclusive) {
+ /* exclusive connection created via OCINLogon() close their
+ associated session when destructed */
+ zend_list_delete(connection->session->num);
+ }
+
if (connection->pError) {
OCIHandleFree((dvoid *) connection->pError, (ub4) OCI_HTYPE_ERROR);
}
@@ -1971,7 +1971,7 @@
return;
}
- oci_debug("_oci_close_session: logging-off sess=%d",session->num);
+ oci_debug("START _oci_close_session: logging-off sess=%d",session->num);
if (session->open) {
/* Temporary Service Context */