From: Antony Dovgal <tony2001@php.net>
Date: Wed, 10 May 2006 10:07:28 +0000 (+0000)
Subject: MFH: fix #37392 (Unnecessary call to OCITransRollback() at the end of request)
X-Git-Tag: php-5.2.0RC1~621
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0881dbd101bd685b0e7fe9964395f56965081b20;p=php

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

diff --git a/NEWS b/NEWS
index 9fb528395a..752f267e1d 100644
--- 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 1c73008ed4..adb6fb298e 100644
--- 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);