sixd Fri, 25 Jun 2010 21:18:09 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=300753
Log:
Remove hard coded lib extension. Prepare for OCI8 1.4.2 release
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/config.m4
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/config.m4
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/ext/oci8/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/config.m4 2010-06-25 21:09:13 UTC (rev 300752)
+++ php/php-src/branches/PHP_5_3/ext/oci8/config.m4 2010-06-25 21:18:09 UTC (rev 300753)
@@ -37,7 +37,7 @@
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}])
Modified: php/php-src/branches/PHP_5_3/ext/oci8/package.xml
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/package.xml 2010-06-25 21:09:13 UTC (rev 300752)
+++ php/php-src/branches/PHP_5_3/ext/oci8/package.xml 2010-06-25 21:18:09 UTC (rev 300753)
@@ -33,7 +33,7 @@
<active>no</active>
</lead>
- <date>2010-03-30</date>
+ <date>2010-06-25</date>
<time>15:00:00</time>
<version>
@@ -41,14 +41,15 @@
<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 @@
<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 @@
<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 @@
<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 @@
<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 @@
<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" />
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-06-25 21:09:13 UTC (rev 300752)
+++ php/php-src/branches/PHP_5_3/ext/oci8/php_oci8.h 2010-06-25 21:18:09 UTC (rev 300753)
@@ -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
Modified: php/php-src/trunk/ext/oci8/config.m4
===================================================================
--- php/php-src/trunk/ext/oci8/config.m4 2010-06-25 21:09:13 UTC (rev 300752)
+++ php/php-src/trunk/ext/oci8/config.m4 2010-06-25 21:18:09 UTC (rev 300753)
@@ -37,7 +37,7 @@
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}])
Modified: php/php-src/trunk/ext/oci8/package.xml
===================================================================
--- php/php-src/trunk/ext/oci8/package.xml 2010-06-25 21:09:13 UTC (rev 300752)
+++ php/php-src/trunk/ext/oci8/package.xml 2010-06-25 21:18:09 UTC (rev 300753)
@@ -33,7 +33,7 @@
<active>no</active>
</lead>
- <date>2010-02-11</date>
+ <date>2010-06-25</date>
<time>15:00:00</time>
<version>
@@ -41,12 +41,15 @@
<api>1.4.2</api>
</version>
<stability>
- <release>development</release>
- <api>development</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 #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)
</notes>
<contents>
<dir name="/">
@@ -76,20 +79,27 @@
<file name="b47243_1.phpt" role="test" />
<file name="b47243_2.phpt" role="test" />
<file name="b47243_3.phpt" role="test" />
+ <file name="bind_char_1_11gR1.phpt" role="test" />
<file name="bind_char_1.phpt" role="test" />
+ <file name="bind_char_2_11gR1.phpt" role="test" />
<file name="bind_char_2.phpt" role="test" />
+ <file name="bind_char_3_11gR1.phpt" role="test" />
<file name="bind_char_3.phpt" role="test" />
+ <file name="bind_char_4_11gR1.phpt" role="test" />
<file name="bind_char_4.phpt" role="test" />
<file name="bind_empty.phpt" role="test" />
- <file name="bind_error.phpt" role="test" />
<file name="bind_long.phpt" role="test" />
<file name="bind_long_raw.phpt" role="test" />
<file name="bind_raw.phpt" role="test" />
+ <file name="bind_rowid.phpt" role="test" />
<file name="bug26133.phpt" role="test" />
+ <file name="bug27303_1_11gR1.phpt" role="test" />
+ <file name="bug27303_1.phpt" role="test" />
+ <file name="bug27303_2_11gR1.phpt" role="test" />
<file name="bug27303_2.phpt" role="test" />
<file name="bug27303_3.phpt" role="test" />
+ <file name="bug27303_4_11gR1.phpt" role="test" />
<file name="bug27303_4.phpt" role="test" />
- <file name="bug27303.phpt" role="test" />
<file name="bug32325.phpt" role="test" />
<file name="bug35973.phpt" role="test" />
<file name="bug36010.phpt" role="test" />
@@ -118,7 +128,8 @@
<file name="bug46994.phpt" role="test" />
<file name="bug47189.phpt" role="test" />
<file name="bug47281.phpt" role="test" />
- <file name="bug6109.phpt" role="test" />
+ <file name="bug51253.phpt" role="test" />
+ <file name="bug51291.phpt" role="test" />
<file name="close.phpt" role="test" />
<file name="coll_001.phpt" role="test" />
<file name="coll_002_func.phpt" role="test" />
@@ -152,8 +163,9 @@
<file name="coll_017.phpt" role="test" />
<file name="coll_018.phpt" role="test" />
<file name="coll_019.phpt" role="test" />
+ <file name="commit_001.phpt" role="test" />
+ <file name="commit_002.phpt" role="test" />
<file name="commit_old.phpt" role="test" />
- <file name="commit.phpt" role="test" />
<file name="conn_attr_1.phpt" role="test" />
<file name="conn_attr_2.phpt" role="test" />
<file name="conn_attr_3.phpt" role="test" />
@@ -218,7 +230,9 @@
<file name="edition_2.phpt" role="test" />
<file name="error1.phpt" role="test" />
<file name="error2.phpt" role="test" />
+ <file name="error_bind.phpt" role="test" />
<file name="error_old.phpt" role="test" />
+ <file name="error_parse.phpt" role="test" />
<file name="error.phpt" role="test" />
<file name="exec_fetch.phpt" role="test" />
<file name="execute_mode.phpt" role="test" />
@@ -295,11 +309,9 @@
<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" />
- <file name="parse_error.phpt" role="test" />
<file name="password_2.phpt" role="test" />
<file name="password_new.phpt" role="test" />
<file name="password_old.phpt" role="test" />
@@ -309,6 +321,7 @@
<file name="pecl_bug10194.phpt" role="test" />
<file name="pecl_bug16035.phpt" role="test" />
<file name="pecl_bug16842.phpt" role="test" />
+ <file name="pecl_bug6109.phpt" role="test" />
<file name="pecl_bug8816.phpt" role="test" />
<file name="persistent.phpt" role="test" />
<file name="prefetch_old.phpt" role="test" />
@@ -320,7 +333,6 @@
<file name="refcur_prefetch_3.phpt" role="test" />
<file name="reflection1.phpt" role="test" />
<file name="reflection2.phpt" role="test" />
- <file name="rowid_bind.phpt" role="test" />
<file name="select_null.phpt" role="test" />
<file name="serverversion.phpt" role="test" />
<file name="skipif.inc" role="test" />
Modified: php/php-src/trunk/ext/oci8/php_oci8.h
===================================================================
--- php/php-src/trunk/ext/oci8/php_oci8.h 2010-06-25 21:09:13 UTC (rev 300752)
+++ php/php-src/trunk/ext/oci8/php_oci8.h 2010-06-25 21:18:09 UTC (rev 300753)
@@ -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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
