From 9b9eaba0834a0f985290304187189d0e33834b30 Mon Sep 17 00:00:00 2001
From: Christopher Jones <sixd@php.net>
Date: Fri, 27 Sep 2013 17:00:41 -0700
Subject: [PATCH] OCI8: Fix alloc function and DLL generation

---
 ext/oci8/oci8.c           |  2 +-
 ext/oci8/oci8_interface.c |  2 +-
 ext/oci8/package.xml      | 26 +++++++++++++++++++++-----
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index f04114d4d6..6723c22019 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -151,7 +151,7 @@ static sword php_oci_ping_init(php_oci_connection *connection, OCIError *errh TS
 /* }}} */
 
 /* {{{ dynamically loadable module stuff */
-#if defined(COMPILE_DL_OCI8) || defined(COMPILE_DL_OCI8_11G)
+#if defined(COMPILE_DL_OCI8) || defined(COMPILE_DL_OCI8_11G) || defined(COMPILE_DL_OCI8_12C)
 ZEND_GET_MODULE(oci8)
 #endif /* COMPILE_DL */
 /* }}} */
diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c
index 3fad90d9c7..0f17f935f1 100644
--- a/ext/oci8/oci8_interface.c
+++ b/ext/oci8/oci8_interface.c
@@ -1788,7 +1788,7 @@ PHP_FUNCTION(oci_set_client_identifier)
 
 	if (client_id) {
 		/* this long winded copy allows compatibility with older PHP versions */
-		connection->client_id = (char *)safe_emalloc(client_id_len+1, sizeof(char), connection->is_persistent);
+		connection->client_id = (char *)pemalloc(client_id_len+1, connection->is_persistent);
 		memcpy(connection->client_id, client_id, client_id_len);
 		connection->client_id[client_id_len] = '\0';
 	} else {
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index 24ba635fef..cd6bb04c0b 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -44,8 +44,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <time>12:00:00</time>
 
   <version>
-   <release>2.0.3</release>
-   <api>2.0.3</api>
+   <release>2.0.4</release>
+   <api>2.0.4</api>
   </version>
   <stability>
    <release>devel</release>
@@ -53,9 +53,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   </stability>
   <license uri="http://www.php.net/license">PHP</license>
   <notes>
-Add the oci_set_client_identifier() value and statement structure pointer to several DTrace probes.
-Use 'phpoci' as the DTrace provider name since uniqueness is required by the Linux fasttrap module.
-Update Windows builds to create only php_oci8_12c.dll.
+Fix persistent memory usage with --enable-dtrace
+Export get_module() for Windows php_oci8_12c.dll
   </notes>
  <contents>
   <dir name="/">
@@ -454,6 +453,23 @@ Update Windows builds to create only php_oci8_12c.dll.
  </extsrcrelease>
  <changelog>
 
+<release>
+  <version>
+   <release>2.0.3</release>
+   <api>2.0.3</api>
+  </version>
+  <stability>
+   <release>devel</release>
+   <api>devel</api>
+  </stability>
+  <license uri="http://www.php.net/license">PHP</license>
+  <notes>
+Add the oci_set_client_identifier() value and statement structure pointer to several DTrace probes.
+Use 'phpoci' as the DTrace provider name since uniqueness is required by the Linux fasttrap module.
+Update Windows builds to create only php_oci8_12c.dll.
+  </notes>
+</release>
+
 <release>
   <version>
    <release>2.0.2</release>
-- 
2.49.0