tony2001 Wed May 10 10:06:57 2006 UTC
Modified files:
/php-src/ext/oci8 oci8.c
Log:
fix #37392 (Unnecessary call to OCITransRollback() at the end of request)
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8.c?r1=1.297&r2=1.298&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.297 php-src/ext/oci8/oci8.c:1.298
--- php-src/ext/oci8/oci8.c:1.297 Wed Apr 12 19:22:12 2006
+++ php-src/ext/oci8/oci8.c Wed May 10 10:06:57 2006
@@ -26,7 +26,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.297 2006/04/12 19:22:12 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.298 2006/05/10 10:06:57 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -647,7 +647,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.297 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.298 $");
sprintf(buf, "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);
@@ -1718,7 +1718,9 @@
connection->descriptors = NULL;
}
- php_oci_connection_rollback(connection TSRMLS_CC);
+ if (connection->needs_commit) {
+ php_oci_connection_rollback(connection
TSRMLS_CC);
+ }
if (OCI_G(persistent_timeout) > 0) {
connection->idle_expiry = timestamp +
OCI_G(persistent_timeout);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
