cvs: php-src(PHP_5_2) / NEWS /ext/oci8 oci8.c
| From: | Antony Dovgal | Date: | Wed, 10 May 2006 10:07:28 +0000 |
| Subject: | cvs: php-src(PHP_5_2) / NEWS /ext/oci8 oci8.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-38122@lists.php.net to get a copy of this message | ||
tony2001 Wed May 10 10:07:28 2006 UTC
Modified files: (Branch: PHP_5_2)
/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.16.2.1&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.16.2.1
--- 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:07:28 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.16.2.1 2006/05/10 10:07:28 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.16.2.1 $");
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.547.2.9&r2=1.2027.2.547.2.10&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.9 php-src/NEWS:1.2027.2.547.2.10
--- php-src/NEWS:1.2027.2.547.2.9 Wed May 10 09:27:23 2006
+++ php-src/NEWS Wed May 10 10:07:28 2006
@@ -15,6 +15,8 @@
- 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>).