tony2001 Mon Jun 13 05:30:52 2005 EDT Modified files: /php-src/ext/oci8 oci8.c Log: 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.267&r2=1.268&ty=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.267 php-src/ext/oci8/oci8.c:1.268 --- php-src/ext/oci8/oci8.c:1.267 Thu Apr 28 10:10:42 2005 +++ php-src/ext/oci8/oci8.c Mon Jun 13 05:30:49 2005 @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.267 2005/04/28 14:10:42 tony2001 Exp $ */ +/* $Id: oci8.c,v 1.268 2005/06/13 09:30:49 tony2001 Exp $ */ /* TODO list: * @@ -786,7 +786,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.267 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.268 $"); sprintf(buf, "%ld", num_persistent); php_info_print_table_row(2, "Active Persistent Links", buf); @@ -1015,6 +1015,15 @@ ) ); } + + if (connection->pError) { + CALL_OCI( + OCIHandleFree( + (dvoid *) connection->pError, + (ub4) OCI_HTYPE_ERROR + ) + ); + } if (connection->session && connection->session->exclusive) { /* close associated session when destructed */ @@ -1026,15 +1035,6 @@ efree(connection->descriptors); } - if (connection->pError) { - CALL_OCI( - OCIHandleFree( - (dvoid *) connection->pError, - (ub4) OCI_HTYPE_ERROR - ) - ); - } - oci_debug("END _oci_conn_list_dtor: id=%d",connection->id); efree(connection); @@ -3694,6 +3694,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