Added support for Shared Data Mode for OCI8_VERSION >= 8.1, which will provide memory...

diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 6ea4fc1c3a8060e55eaeebbf663057ec9a78c359..626b5ce59c83cdbedb32d8bae507a342b637e3c1 100644 (file)
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -74,6 +74,7 @@ if test "$PHP_OCI8" != "no"; then
       PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
       AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
       AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])
+      AC_DEFINE(HAVE_OCI8_SHARED_MODE,1,[ ])
       ;;
 
     9.0)
@@ -84,6 +85,7 @@ if test "$PHP_OCI8" != "no"; then
       PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
       AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
       AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])
+      AC_DEFINE(HAVE_OCI8_SHARED_MODE,1,[ ])
       AC_DEFINE(HAVE_OCI9,1,[ ])
       ;;
 

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 3a14bb4aebd84539c8f28e47bc1ee612a4e98454..a63474ee25f25e0d49ab44a561f7a3b55009e174 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -464,12 +464,24 @@ PHP_MINIT_FUNCTION(oci)
        zend_class_entry oci_coll_class_entry;
 #endif
 
+#ifdef HAVE_OCI8_SHARED_MODE
+
+#ifdef WITH_COLLECTIONS
+#define PHP_OCI_INIT_MODE OCI_SHARED | OCI_OBJECT
+#else
+#define PHP_OCI_INIT_MODE OCI_SHARED
+#endif
+
+#else
+
 #ifdef WITH_COLLECTIONS
 #define PHP_OCI_INIT_MODE OCI_DEFAULT | OCI_OBJECT
 #else
 #define PHP_OCI_INIT_MODE OCI_DEFAULT
 #endif
 
+#endif
+
 #if OCI_USE_EMALLOC
        OCIInitialize(PHP_OCI_INIT_MODE, NULL, ocimalloc, ocirealloc, ocifree);
 #else