tony2001 Mon Jun 13 05:38:00 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/oci8 oci8.c
Log:
MFH:
destroy session after destroying error handle
SQLT_CHR is allowed too
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.183.2.18&r2=1.183.2.18.2.1&ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.183.2.18
php-src/ext/oci8/oci8.c:1.183.2.18.2.1
--- php-src/ext/oci8/oci8.c:1.183.2.18 Thu Apr 28 10:13:08 2005
+++ php-src/ext/oci8/oci8.c Mon Jun 13 05:37:57 2005
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.183.2.18 2005/04/28 14:13:08 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.183.2.18.2.1 2005/06/13 09:37:57 tony2001 Exp $ */
/* TODO list:
*
@@ -641,7 +641,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.183.2.18 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.183.2.18.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 );
@@ -836,18 +836,18 @@
(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) {
CALL_OCI(OCIHandleFree(
(dvoid *) connection->pError,
(ub4) OCI_HTYPE_ERROR));
}
+ if (connection->session && connection->session->exclusive) {
+ /* exclusive connection created via OCINLogon() close their
+ associated session when destructed */
+ zend_list_delete(connection->session->num);
+ }
+
oci_debug("END _oci_conn_list_dtor: id=%d",connection->id);
efree(connection);
@@ -2975,6 +2975,8 @@
}
value_sz = sizeof(void*);
break;
+ case SQLT_CHR:
+ break;
default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown or
unsupported datatype given: %u", ocitype);
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
