[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/oci8.c trunk/ext/oci8/oci8.c
sixd Fri, 25 Jun 2010 21:09:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=300752 Log: Fix bug #52186 (phpinfo shows 10.1 or 11.1 when installed with ORACLE_HOME 10.2 or 11.2) Bug: http://bugs.php.net/52186 (Assigned) phpinfo() shows 10.1 or 11.1 when installed with ORACLE_HOME 10.2 or 11.2 Changed paths: U php/php-src/branches/PHP_5_3/ext/oci8/oci8.c U php/php-src/trunk/ext/oci8/oci8.c Modified: php/php-src/branches/PHP_5_3/ext/oci8/oci8.c === --- php/php-src/branches/PHP_5_3/ext/oci8/oci8.c2010-06-25 18:23:54 UTC (rev 300751) +++ php/php-src/branches/PHP_5_3/ext/oci8/oci8.c2010-06-25 21:09:13 UTC (rev 300752) @@ -1300,19 +1300,26 @@ snprintf(buf, sizeof(buf), %ld, OCI_G(num_links)); php_info_print_table_row(2, Active Connections, buf); +#ifdefined(OCI_MAJOR_VERSION) defined(OCI_MINOR_VERSION) + snprintf(buf, sizeof(buf), %d.%d, OCI_MAJOR_VERSION, OCI_MINOR_VERSION); +#elif defined(PHP_OCI8_ORACLE_VERSION) + snprintf(buf, sizeof(buf), %s, PHP_OCI8_ORACLE_VERSION); +#else + snprintf(buf, sizeof(buf), Unknown); +#endif +#if defined(HAVE_OCI_INSTANT_CLIENT) + php_info_print_table_row(2, Oracle Instant Client Version, buf); +#else + php_info_print_table_row(2, Oracle Version, buf); +#endif + #if !defined(PHP_WIN32) !defined(HAVE_OCI_INSTANT_CLIENT) -#ifdef PHP_OCI8_ORACLE_VERSION - php_info_print_table_row(2, Oracle Version, PHP_OCI8_ORACLE_VERSION); -#endif -#ifdef PHP_OCI8_DEF_DIR +#if defined(PHP_OCI8_DEF_DIR) php_info_print_table_row(2, Compile-time ORACLE_HOME, PHP_OCI8_DEF_DIR); #endif -#ifdef PHP_OCI8_DEF_SHARED_LIBADD +#if defined(PHP_OCI8_DEF_SHARED_LIBADD) php_info_print_table_row(2, Libraries Used, PHP_OCI8_DEF_SHARED_LIBADD); #endif -#elif defined(HAVE_OCI_INSTANT_CLIENT) defined(OCI_MAJOR_VERSION) defined(OCI_MINOR_VERSION) - snprintf(buf, sizeof(buf), %d.%d, OCI_MAJOR_VERSION, OCI_MINOR_VERSION); - php_info_print_table_row(2, Oracle Instant Client Version, buf); #endif php_info_print_table_row(2, Temporary Lob support, enabled); Modified: php/php-src/trunk/ext/oci8/oci8.c === --- php/php-src/trunk/ext/oci8/oci8.c 2010-06-25 18:23:54 UTC (rev 300751) +++ php/php-src/trunk/ext/oci8/oci8.c 2010-06-25 21:09:13 UTC (rev 300752) @@ -1300,19 +1300,26 @@ snprintf(buf, sizeof(buf), %ld, OCI_G(num_links)); php_info_print_table_row(2, Active Connections, buf); +#ifdefined(OCI_MAJOR_VERSION) defined(OCI_MINOR_VERSION) + snprintf(buf, sizeof(buf), %d.%d, OCI_MAJOR_VERSION, OCI_MINOR_VERSION); +#elif defined(PHP_OCI8_ORACLE_VERSION) + snprintf(buf, sizeof(buf), %s, PHP_OCI8_ORACLE_VERSION); +#else + snprintf(buf, sizeof(buf), Unknown); +#endif +#if defined(HAVE_OCI_INSTANT_CLIENT) + php_info_print_table_row(2, Oracle Instant Client Version, buf); +#else + php_info_print_table_row(2, Oracle Version, buf); +#endif + #if !defined(PHP_WIN32) !defined(HAVE_OCI_INSTANT_CLIENT) -#ifdef PHP_OCI8_ORACLE_VERSION - php_info_print_table_row(2, Oracle Version, PHP_OCI8_ORACLE_VERSION); -#endif -#ifdef PHP_OCI8_DEF_DIR +#if defined(PHP_OCI8_DEF_DIR) php_info_print_table_row(2, Compile-time ORACLE_HOME, PHP_OCI8_DEF_DIR); #endif -#ifdef PHP_OCI8_DEF_SHARED_LIBADD +#if defined(PHP_OCI8_DEF_SHARED_LIBADD) php_info_print_table_row(2, Libraries Used, PHP_OCI8_DEF_SHARED_LIBADD); #endif -#elif defined(HAVE_OCI_INSTANT_CLIENT) defined(OCI_MAJOR_VERSION) defined(OCI_MINOR_VERSION) - snprintf(buf, sizeof(buf), %d.%d, OCI_MAJOR_VERSION, OCI_MINOR_VERSION); - php_info_print_table_row(2, Oracle Instant Client Version, buf); #endif php_info_print_table_row(2, Temporary Lob support, enabled); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/config.m4 branches/PHP_5_3/ext/oci8/package.xml branches/PHP_5_3/ext/oci8/php_oci8.h trunk/ext/oci8/config.m4 trunk/ext/oci8/package.xml trunk/ex
sixd Fri, 25 Jun 2010 21:18:09 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=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 @@
activeno/active
/lead
- date2010-03-30/date
+ date2010-06-25/date
time15:00:00/time
version
@@ -41,14 +41,15 @@
api1.4.2/api
/version
stability
- releasedevel/release
- apidevel/api
+ releasestable/release
+ apistable/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
