tony2001 Wed Jun 28 15:03:33 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/oci8 oci8.c
Log:
MFH: fix #37931 (possible crash after database restart when using persistent
connections)
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.7&r2=1.269.2.16.2.8&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.7
php-src/ext/oci8/oci8.c:1.269.2.16.2.8
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.7 Fri Jun 23 08:26:15 2006
+++ php-src/ext/oci8/oci8.c Wed Jun 28 15:03:33 2006
@@ -26,7 +26,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.269.2.16.2.7 2006/06/23 08:26:15 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.8 2006/06/28 15:03:33 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -652,7 +652,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
php_info_print_table_row(2, "Version", "1.2.1");
- php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.7 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.8 $");
sprintf(buf, "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);
@@ -1074,8 +1074,8 @@
}
}
/* server died */
+ connection->is_open = 0;
zend_hash_del(&EG(persistent_list),
hashed_details.c, hashed_details.len+1);
- php_oci_connection_close(connection
TSRMLS_CC);
connection = NULL;
goto open;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
