svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/oci8/oci8.c branches/PHP_5_3/ext/oci8/package.xml branches/PHP_5_3/ext/oci8/php_oci8.h
trunk/ext/oci8/oci8.c trunk/ext/oci8/package.xml trunk/ext/oci8/php_oci8.h

sixd Sat, 07 Aug 2010 00:24:26 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=301960 Log: Fixed bug #51610 (Using oci_connect causes PHP to take a long time to exit). Do PECL OCI8 1.4.3 release Bug: http://bugs.php.net/51610 (Wont fix) 1 second+ needed for OCI8 versus PDO/oci to open/close connection and exit Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/oci8/oci8.c U php/php-src/branches/PHP_5_3/ext/oci8/package.xml U php/php-src/branches/PHP_5_3/ext/oci8/php_oci8.h U php/php-src/trunk/ext/oci8/oci8.c U php/php-src/trunk/ext/oci8/package.xml U php/php-src/trunk/ext/oci8/php_oci8.h Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-08-07 00:06:42 UTC (rev 301959) +++ php/php-src/branches/PHP_5_3/NEWS 2010-08-07 00:24:26 UTC (rev 301960) @@ -13,6 +13,9 @@ 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) Modified: php/php-src/branches/PHP_5_3/ext/oci8/oci8.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/oci8.c 2010-08-07 00:06:42 UTC (rev 301959) +++ php/php-src/branches/PHP_5_3/ext/oci8/oci8.c 2010-08-07 00:24:26 UTC (rev 301960) @@ -2701,22 +2701,8 @@ 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: if (iserror && session_pool) { php_oci_spool_close(session_pool TSRMLS_CC); Modified: php/php-src/branches/PHP_5_3/ext/oci8/package.xml =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/package.xml 2010-08-07 00:06:42 UTC (rev 301959) +++ php/php-src/branches/PHP_5_3/ext/oci8/package.xml 2010-08-07 00:24:26 UTC (rev 301960) @@ -37,8 +37,8 @@ <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 @@ </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="/"> @@ -383,6 +378,26 @@ <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> <api>1.4.1</api> </version> Modified: php/php-src/branches/PHP_5_3/ext/oci8/php_oci8.h =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/php_oci8.h 2010-08-07 00:06:42 UTC (rev 301959) +++ php/php-src/branches/PHP_5_3/ext/oci8/php_oci8.h 2010-08-07 00:24:26 UTC (rev 301960) @@ -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 Modified: php/php-src/trunk/ext/oci8/oci8.c =================================================================== --- php/php-src/trunk/ext/oci8/oci8.c 2010-08-07 00:06:42 UTC (rev 301959) +++ php/php-src/trunk/ext/oci8/oci8.c 2010-08-07 00:24:26 UTC (rev 301960) @@ -2694,22 +2694,8 @@ 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: if (iserror && session_pool) { php_oci_spool_close(session_pool TSRMLS_CC); Modified: php/php-src/trunk/ext/oci8/package.xml =================================================================== --- php/php-src/trunk/ext/oci8/package.xml 2010-08-07 00:06:42 UTC (rev 301959) +++ php/php-src/trunk/ext/oci8/package.xml 2010-08-07 00:24:26 UTC (rev 301960) @@ -33,12 +33,12 @@ <active>no</active> </lead> - <date>2010-06-25</date> + <date>2010-08-06</date> <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,10 +46,7 @@ </stability> <license uri="http://www.php.net/license">PHP</license> <notes> - Fixed bug #51691 (Unnecessary realloc causes crashes in PHP trunk tests with interned strings) - Fixed bug #51291 (oci_error doesn't report last error when called two times) - Fixed bug #51577 (Uninitialized memory reference with oci_bind_array_by_name) - Fixed bug #52186 (phpinfo() shows 10.1 or 11.1 when installed with ORACLE_HOME 10.2 or 11.2) + 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="/"> @@ -309,6 +306,7 @@ <file name="lob_temp.phpt" role="test" /> <file name="minfo.phpt" role="test" /> <file name="num.phpt" role="test" /> + <file name="oci8safemode.phpt" role="test" /> <file name="oci_execute_segfault.phpt" role="test" /> <file name="old_oci_close1.phpt" role="test" /> <file name="old_oci_close.phpt" role="test" /> @@ -380,6 +378,26 @@ <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> <api>1.4.1</api> </version> Modified: php/php-src/trunk/ext/oci8/php_oci8.h =================================================================== --- php/php-src/trunk/ext/oci8/php_oci8.h 2010-08-07 00:06:42 UTC (rev 301959) +++ php/php-src/trunk/ext/oci8/php_oci8.h 2010-08-07 00:24:26 UTC (rev 301960) @@ -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