tony2001 Wed Nov 3 08:35:57 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/oci8 oci8.c
Log:
fix bug #30654 (persistent connection is deleted from hash if there was exclusive
connection with the same credentials)
No need for MFB here - 5.x.x branches work fine.
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.183.2.15&r2=1.183.2.16&ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.183.2.15 php-src/ext/oci8/oci8.c:1.183.2.16
--- php-src/ext/oci8/oci8.c:1.183.2.15 Sun Oct 10 11:06:20 2004
+++ php-src/ext/oci8/oci8.c Wed Nov 3 08:35:56 2004
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.183.2.15 2004/10/10 15:06:20 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.183.2.16 2004/11/03 13:35:56 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.15 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.183.2.16 $");
#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 );
@@ -2476,7 +2476,7 @@
hashed_details = session->hashed_details;
- if (! OCI(shutdown)) {
+ if (! OCI(shutdown) && !session->exclusive) {
zend_hash_del(OCI(user), hashed_details, strlen(hashed_details)+1);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
