[PHP-CVS] cvs: php-src(PHP_5_0) /ext/oci8 oci8.c

[Antony Dovgal]

tony2001                Mon Jun 13 05:31:04 2005 EDT

  Modified files:              (Branch: PHP_5_0)
    /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.257.2.7&r2=1.257.2.8&ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.257.2.7 php-src/ext/oci8/oci8.c:1.257.2.8
--- php-src/ext/oci8/oci8.c:1.257.2.7   Thu Apr 28 10:12:23 2005
+++ php-src/ext/oci8/oci8.c     Mon Jun 13 05:31:03 2005
@@ -22,7 +22,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: oci8.c,v 1.257.2.7 2005/04/28 14:12:23 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.257.2.8 2005/06/13 09:31:03 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.257.2.7 $");
+       php_info_print_table_row(2, "Revision", "$Revision: 1.257.2.8 $");
 
        sprintf(buf, "%ld", num_persistent);
        php_info_print_table_row(2, "Active Persistent Links", buf);
@@ -1016,6 +1016,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 */
                zend_list_delete(connection->session->num);
@@ -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);
@@ -3695,6 +3695,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