tony2001 Wed May 10 10:08:24 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/oci8 oci8.c
/php-src NEWS
Log:
MFH: 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.269.2.16&r2=1.269.2.17&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16 php-src/ext/oci8/oci8.c:1.269.2.17
--- php-src/ext/oci8/oci8.c:1.269.2.16 Wed Apr 12 19:21:35 2006
+++ php-src/ext/oci8/oci8.c Wed May 10 10:08:23 2006
@@ -26,7 +26,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.269.2.16 2006/04/12 19:21:35 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.269.2.17 2006/05/10 10:08:23 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.269.2.16 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.17 $");
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);
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.550&r2=1.2027.2.551&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.550 php-src/NEWS:1.2027.2.551
--- php-src/NEWS:1.2027.2.550 Mon May 8 11:56:15 2006
+++ php-src/NEWS Wed May 10 10:08:23 2006
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2006, PHP 5.?.?
+- Fixed bug #37392 (Unnecessary call to OCITransRollback() at the end of
+ request). (Tony)
- Fixed bug #37313 (sigemptyset() used without including <signal.h>).
(jdolecek)
- Fixed bug #37346 (invalid colormap format) (Pierre)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
