clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug #46623 (phpinfo doesn't show compile time ORACLE_HOME with phpize)

Browse Source
This commit is contained in:
Christopher Jones 2009-03-09 17:40:59 +00:00
parent 94a1f50f09
commit c33f88ccb0
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/oci8/config.m4
View File

@ -169,6 +169,8 @@ fi
if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
dnl Using an ORACLE_HOME install
AC_MSG_CHECKING([Oracle Install Directory])
if test "$PHP_OCI8" = "yes"; then
OCI8_DIR=$ORACLE_HOME
@ -238,9 +240,15 @@ if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
PHP_SUBST_OLD(OCI8_SHARED_LIBADD)
PHP_SUBST_OLD(OCI8_DIR)
PHP_SUBST_OLD(OCI8_ORACLE_VERSION)
dnl Fix bug #46623
AC_DEFINE_UNQUOTED(PHP_OCI8_DEF_DIR, "$OCI8_DIR", [ ])
AC_DEFINE_UNQUOTED(PHP_OCI8_DEF_SHARED_LIBADD, "$OCI8_SHARED_LIBADD", [ ])
elif test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then
dnl Using an Oracle Instant Client directory
AC_CHECK_SIZEOF(long int, 4)
LIBDIR_SUFFIX=""
if test "$ac_cv_sizeof_long_int" = "8" ; then

16
ext/oci8/oci8.c
View File

@ -1017,8 +1017,6 @@ PHP_MINIT_FUNCTION(oci)
return SUCCESS;
}
/* ----------------------------------------------------------------- */
PHP_RINIT_FUNCTION(oci)
{
OCI_G(debug_mode) = 0; /* start "fresh" */
@ -1043,8 +1041,6 @@ PHP_MSHUTDOWN_FUNCTION(oci)
PHP_RSHUTDOWN_FUNCTION(oci)
{
/* Set this to indicate request shutdown for all further processing */
#ifdef ZTS
zend_hash_apply_with_argument(&EG(regular_list), (apply_func_arg_t) php_oci_list_helper, (void *)le_descriptor TSRMLS_CC);
zend_hash_apply_with_argument(&EG(regular_list), (apply_func_arg_t) php_oci_list_helper, (void *)le_collection TSRMLS_CC);
@ -1087,17 +1083,15 @@ PHP_MINFO_FUNCTION(oci)
#ifdef PHP_OCI8_ORACLE_VERSION
php_info_print_table_row(2, "Oracle Version", PHP_OCI8_ORACLE_VERSION);
#endif
#ifdef PHP_OCI8_DIR
php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR);
#ifdef PHP_OCI8_DEF_DIR
php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DEF_DIR);
#endif
#ifdef PHP_OCI8_SHARED_LIBADD
php_info_print_table_row(2, "Libraries Used", PHP_OCI8_SHARED_LIBADD);
#ifdef PHP_OCI8_DEF_SHARED_LIBADD
php_info_print_table_row(2, "Libraries Used", PHP_OCI8_DEF_SHARED_LIBADD);
#endif
#else
#if defined(HAVE_OCI_INSTANT_CLIENT) && defined(OCI_MAJOR_VERSION) && defined(OCI_MINOR_VERSION)
#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
#endif
php_info_print_table_row(2, "Temporary Lob support", "enabled");

2
ext/oci8/php_oci8.h
View File

@ -39,7 +39,7 @@
/*
* The version of the OCI8 extension.
*/
#define PHP_OCI8_VERSION "1.3.4"
#define PHP_OCI8_VERSION "1.3.5-dev"
extern zend_module_entry oci8_module_entry;
#define phpext_oci8_ptr &oci8_module_entry