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

diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 6fcfc819380b9145b7c59bc73aa6e74933943f59..3d0f3ad3eb318e4353701ed85e8ba79a0adb3522 100644 (file)
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -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
@@ -239,8 +241,14 @@ if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
   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
@@ -315,5 +323,5 @@ dnl Header directory for manual installation
   PHP_SUBST_OLD(OCI8_SHARED_LIBADD)
   PHP_SUBST_OLD(OCI8_DIR)
   PHP_SUBST_OLD(OCI8_ORACLE_VERSION)
- 
+
 fi

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 8ac689fc28a5fcf289fb9ae8137e6dd9e607c7d1..d1bd81a64cc0ad6dd487d4489b077f0b5aac5084 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -1159,8 +1159,6 @@ PHP_MINIT_FUNCTION(oci)
        return SUCCESS;
 }
 
-/* ----------------------------------------------------------------- */
-
 PHP_RINIT_FUNCTION(oci)
 {
        OCI_G(debug_mode) = 0; /* start "fresh" */
@@ -1185,8 +1183,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);
@@ -1229,17 +1225,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");

diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index 152ceaf29049a4f8b5753e50db5b04159fd931d3..4b97fc111fa7ef5ef53dca70098cd3bba7c7e7ec 100644 (file)
--- 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.3.4"
+#define PHP_OCI8_VERSION "1.3.5-dev"
 
 extern zend_module_entry oci8_module_entry;
 #define phpext_oci8_ptr &oci8_module_entry