diff options
| -rw-r--r-- | ext/oci8/config.m4 | 2 | ||||
| -rw-r--r-- | ext/oci8/package.xml | 32 | ||||
| -rw-r--r-- | ext/oci8/php_oci8.h | 2 |
3 files changed, 8 insertions, 28 deletions
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4 index 79ff000b99..70e9cffd56 100644 --- a/ext/oci8/config.m4 +++ b/ext/oci8/config.m4 @@ -37,7 +37,7 @@ AC_DEFUN([AC_OCI8_CHECK_LIB_DIR],[ OCI8_LIB_DIR=$PHP_OCI8_OH_LIBDIR else dnl This isn't an ORACLE_HOME. Try heuristic examination of the dir to help the user - if test -f "$OCI8_DIR/libociei.so"; then + if test -f "$OCI8_DIR/libociei.$SHLIB_SUFFIX_NAME"; then AC_MSG_ERROR([Expected an ORACLE_HOME top level directory but ${OCI8_DIR} appears to be an Instant Client directory. Try --with-oci8=instantclient,${OCI8_DIR}]) else AC_MSG_ERROR([Oracle library directory not found in ${OCI8_DIR}]) diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml index c9b5625fbb..8e0f36d817 100644 --- a/ext/oci8/package.xml +++ b/ext/oci8/package.xml @@ -33,7 +33,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> <active>no</active> </lead> - <date>2010-03-30</date> + <date>2010-06-25</date> <time>15:00:00</time> <version> @@ -41,14 +41,15 @@ http://pear.php.net/dtd/package-2.0.xsd"> <api>1.4.2</api> </version> <stability> - <release>devel</release> - <api>devel</api> + <release>stable</release> + <api>stable</api> </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 #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 #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) </notes> <contents> <dir name="/"> @@ -89,19 +90,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> <file name="bind_empty.phpt" role="test" /> <file name="bind_long.phpt" role="test" /> <file name="bind_long_raw.phpt" role="test" /> - <file name="bind_misccoltypes_errs.phpt" role="test" /> - <file name="bind_misccoltypes.phpt" role="test" /> - <file name="bind_number.phpt" role="test" /> - <file name="bind_query.phpt" role="test" /> <file name="bind_raw.phpt" role="test" /> <file name="bind_rowid.phpt" role="test" /> - <file name="bind_sqltafc.phpt" role="test" /> - <file name="bind_sqltchr.phpt" role="test" /> - <file name="bind_sqltint.phpt" role="test" /> - <file name="bind_sqltnum.phpt" role="test" /> - <file name="bind_unsupported_1.phpt" role="test" /> - <file name="bind_unsupported_2.phpt" role="test" /> - <file name="bind_unsupported_3.phpt" role="test" /> <file name="bug26133.phpt" role="test" /> <file name="bug27303_1_11gR1.phpt" role="test" /> <file name="bug27303_1.phpt" role="test" /> @@ -204,22 +194,17 @@ http://pear.php.net/dtd/package-2.0.xsd"> <file name="cursor_bind.phpt" role="test" /> <file name="cursors_old.phpt" role="test" /> <file name="cursors.phpt" role="test" /> - <file name="dbmsoutput.phpt" role="test" /> <file name="debug.phpt" role="test" /> - <file name="default_prefetch0.phpt" role="test" /> <file name="default_prefetch1.phpt" role="test" /> <file name="default_prefetch2.phpt" role="test" /> <file name="default_prefetch.phpt" role="test" /> - <file name="define0.phpt" role="test" /> <file name="define1.phpt" role="test" /> <file name="define2.phpt" role="test" /> <file name="define3.phpt" role="test" /> <file name="define4.phpt" role="test" /> <file name="define5.phpt" role="test" /> - <file name="define6.phpt" role="test" /> <file name="define_old.phpt" role="test" /> <file name="define.phpt" role="test" /> - <file name="define_rowid.phpt" role="test" /> <file name="descriptors.phpt" role="test" /> <file name="details.inc" role="test" /> <file name="drcp_cclass1.phpt" role="test" /> @@ -241,7 +226,6 @@ http://pear.php.net/dtd/package-2.0.xsd"> <file name="driver_name.phpt" role="test" /> <file name="drop_table.inc" role="test" /> <file name="drop_type.inc" role="test" /> - <file name="dupcolnames.phpt" role="test" /> <file name="edition_1.phpt" role="test" /> <file name="edition_2.phpt" role="test" /> <file name="error1.phpt" role="test" /> @@ -256,7 +240,6 @@ http://pear.php.net/dtd/package-2.0.xsd"> <file name="extauth_02.phpt" role="test" /> <file name="extauth_03.phpt" role="test" /> <file name="extauth_04.phpt" role="test" /> - <file name="fetch_all1.phpt" role="test" /> <file name="fetch_all2.phpt" role="test" /> <file name="fetch_all3.phpt" role="test" /> <file name="fetch_all4.phpt" role="test" /> @@ -267,15 +250,12 @@ http://pear.php.net/dtd/package-2.0.xsd"> <file name="fetch_into1.phpt" role="test" /> <file name="fetch_into2.phpt" role="test" /> <file name="fetch_into.phpt" role="test" /> - <file name="fetch_object_1.phpt" role="test" /> <file name="fetch_object_2.phpt" role="test" /> <file name="fetch_object.phpt" role="test" /> <file name="fetch.phpt" role="test" /> <file name="fetch_row.phpt" role="test" /> - <file name="field_funcs0.phpt" role="test" /> <file name="field_funcs1.phpt" role="test" /> <file name="field_funcs2.phpt" role="test" /> - <file name="field_funcs3.phpt" role="test" /> <file name="field_funcs_old.phpt" role="test" /> <file name="field_funcs.phpt" role="test" /> <file name="function_aliases.phpt" role="test" /> diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h index a2aac090d1..a79702efd3 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-development" +#define PHP_OCI8_VERSION "1.4.2" extern zend_module_entry oci8_module_entry; #define phpext_oci8_ptr &oci8_module_entry |