From: Christopher Jones <sixd@php.net>
Date: Sat, 7 Aug 2010 00:24:26 +0000 (+0000)
Subject: Fixed bug #51610 (Using oci_connect causes PHP to take a long time to exit). Do PECL... 
X-Git-Tag: php-5.3.4RC1~383
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0dc4810eb5ef87f36b949462ff5837f89252868;p=php

Fixed bug #51610 (Using oci_connect causes PHP to take a long time to exit). Do PECL OCI8 1.4.3 release
---

diff --git a/NEWS b/NEWS
index fa1e101c09..2ced1600be 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,9 @@ PHP                                                                        NEWS
   empty). (Felipe)
 - Fixed bug #52436 (Compile error if systems do not have stdint.h)
   (Sriram Natarajan)
+- Fixed bug #51610 (Using oci_connect causes PHP to take a long time to
+  exit). Requires Oracle bug fix 9891199 for this patch to have an
+  effect. (Oracle Corp.)
 
 22 Jul 2010, PHP 5.3.3
 - Upgraded bundled sqlite to version 3.6.23.1. (Ilia)
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 047562849c..1be6315eef 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -2701,20 +2701,6 @@ static php_oci_spool *php_oci_create_spool(char *username, int username_len, cha
 	if (OCI_G(errcode) != OCI_SUCCESS) {
 		php_oci_error(OCI_G(err), OCI_G(errcode) TSRMLS_CC);
 		iserror = 1;
-		goto exit_create_spool;
-	}
-
-	/* Set the session pool's timeout to the oci8.persistent_timeout param */
-	if (OCI_G(persistent_timeout)) {
-		ub4 timeout = OCI_G(persistent_timeout);
-
-		PHP_OCI_CALL_RETURN(OCI_G(errcode), OCIAttrSet, ((dvoid *) session_pool->poolh, (ub4) OCI_HTYPE_SPOOL, (void *) &timeout, (ub4) sizeof(timeout), (ub4) OCI_ATTR_SPOOL_TIMEOUT, OCI_G(err)));
-
-		if (OCI_G(errcode) != OCI_SUCCESS) {
-			php_oci_error(OCI_G(err), OCI_G(errcode) TSRMLS_CC);
-			iserror = 1;
-			goto exit_create_spool;
-		}
 	}
 
 exit_create_spool:
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index 9a3c7cec62..de5c8a04fd 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -37,8 +37,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <time>15:00:00</time>
 
  <version>
-  <release>1.4.2</release>
-  <api>1.4.2</api>
+  <release>1.4.3</release>
+  <api>1.4.3</api>
  </version>
  <stability>
   <release>stable</release>
@@ -46,12 +46,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </stability>
  <license uri="http://www.php.net/license">PHP</license>
  <notes>
-    Fixed bug #52186 (phpinfo() shows 10.1 or 11.1 when installed with ORACLE_HOME 10.2 or 11.2)
-    Fixed bug #51691 (Unnecessary realloc causes crashes in PHP trunk tests with interned strings)
-    Fixed bug #51577 (Uninitialized memory reference with oci_bind_array_by_name)
-    Fixed bug #51291 (oci_error doesn't report last error when called two times)
-
-    OCI8 1.4.2 is included in PHP 5.3.3
+    Fixed bug #51610 (Using oci_connect causes PHP to take a long time to exit). Requires Oracle bug fix 9891199 for this patch to have an effect.
  </notes>
  <contents>
   <dir name="/">
@@ -381,6 +376,26 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </extsrcrelease>
  <changelog>
 
+<release>
+ <version>
+  <release>1.4.2</release>
+  <api>1.4.2</api>
+ </version>
+ <stability>
+  <release>stable</release>
+  <api>stable</api>
+ </stability>
+ <license uri="http://www.php.net/license">PHP</license>
+ <notes>
+    Fixed bug #52186 (phpinfo() shows 10.1 or 11.1 when installed with ORACLE_HOME 10.2 or 11.2)
+    Fixed bug #51691 (Unnecessary realloc causes crashes in PHP trunk tests with interned strings)
+    Fixed bug #51577 (Uninitialized memory reference with oci_bind_array_by_name)
+    Fixed bug #51291 (oci_error doesn't report last error when called two times)
+
+    OCI8 1.4.2 is included in PHP 5.3.3
+ </notes>
+</release>
+
 <release>
  <version>
   <release>1.4.1</release>
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index a79702efd3..9bf589d660 100644
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -46,7 +46,7 @@
  */
 #undef PHP_OCI8_VERSION
 #endif
-#define PHP_OCI8_VERSION "1.4.2"
+#define PHP_OCI8_VERSION "1.4.3"
 
 extern zend_module_entry oci8_module_entry;
 #define phpext_oci8_ptr &oci8_module_entry