tony2001 Wed Apr 12 17:59:32 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/oci8 oci8.c
Log:
correct fix for bug #37055
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.13&r2=1.269.2.14&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.13 php-src/ext/oci8/oci8.c:1.269.2.14
--- php-src/ext/oci8/oci8.c:1.269.2.13 Wed Apr 12 13:37:51 2006
+++ php-src/ext/oci8/oci8.c Wed Apr 12 17:59:32 2006
@@ -26,7 +26,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.269.2.13 2006/04/12 13:37:51 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.269.2.14 2006/04/12 17:59:32 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -541,6 +541,7 @@
REGISTER_LONG_CONSTANT("SQLT_FLT",SQLT_FLT, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("SQLT_UIN",SQLT_UIN, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("SQLT_LNG",SQLT_LNG, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("SQLT_LBI",SQLT_LBI, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("SQLT_ODT",SQLT_ODT, CONST_CS |
CONST_PERSISTENT);
#if defined(HAVE_OCI_INSTANT_CLIENT) || (defined(OCI_MAJOR_VERSION) &&
OCI_MAJOR_VERSION > 10)
REGISTER_LONG_CONSTANT("SQLT_BDOUBLE",SQLT_BDOUBLE, CONST_CS |
CONST_PERSISTENT);
@@ -645,7 +646,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.13 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.14 $");
sprintf(buf, "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);
@@ -1056,7 +1057,9 @@
/* okay, the connection
is open and the server is still alive */
connection->used_this_request = 1;
smart_str_free_ex(&hashed_details, 0);
-
zend_list_addref(connection->rsrc_id);
+ if
(zend_list_addref(connection->rsrc_id) == FAILURE) {
+
connection->rsrc_id = zend_list_insert(connection, le_pconnection);
+ }
return connection;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
