MFH: fix #37392 (Unnecessary call to OCITransRollback() at the end of request)

diff --git a/NEWS b/NEWS
index 9fb528395a074e6dffd614f78c9573061772097e..752f267e1da9d8cc4bb3aea68ec669b5c5a56e71 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,8 @@ PHP                                                                        NEWS
 - Added support for Apache 2.2 handler in the Windows distro. (Edin)
 - Added pg_field_table() function. (Edin)
 - Add implementation of curl_multi_info_read (Brian)
+- Fixed bug #37392 (Unnecessary call to OCITransRollback() at the end of 
+  request). (Tony)
 - Fixed bug #37376 (fastcgi.c compile fail with gcc 2.95.4). (Ilia)
 - Fixed bug #37348 (make PEAR install ignore open_basedir). (Ilia)
 - Fixed bug #37313 (sigemptyset() used without including <signal.h>).

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 1c73008ed457fed10a71fdce3796e1e25155ed7e..adb6fb298e0d75ea112b88a0cabebfa961c20dc9 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -1718,7 +1718,9 @@ static int php_oci_persistent_helper(zend_rsrc_list_entry *le TSRMLS_DC)
                                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);