From: Christopher Jones <sixd@php.net>
Date: Mon, 9 Mar 2009 18:03:34 +0000 (+0000)
Subject: PECL Bug #15988 (sqlnet.ora isn't read with older Oracle libraries)
X-Git-Tag: php-5.4.0alpha1~191^2~4181
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8996c4b6cab5c55093eb4038dc44aa75312b5a1;p=php

PECL Bug #15988 (sqlnet.ora isn't read with older Oracle libraries)
---

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 89717411e4..c9716ac8c4 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -852,6 +852,22 @@ static void php_oci_init_global_handles(TSRMLS_D)
 		goto oci_error;
 	}
 
+#if !defined(OCI_MAJOR_VERSION) || (OCI_MAJOR_VERSION < 11)
+	/* This works around PECL bug #15988 (sqlnet.ora not being read).
+	 * The root cause was fixed in Oracle 10.2.0.4 but there is no
+	 * compile time method to check for that precise patch level, nor
+	 * can it be guaranteed that runtime will use the same patch level
+	 * the code was compiled with.  So, we do this code for all non
+	 * 11g versions.
+	 */
+	OCICPool *cpoolh;
+	ub4 cpoolmode = 0x80000000;	/* Pass invalid mode to OCIConnectionPoolCreate */
+	PHP_OCI_CALL(OCIHandleAlloc, (OCI_G(env), (dvoid **) &cpoolh, OCI_HTYPE_CPOOL, (size_t) 0, (dvoid **) 0));
+	PHP_OCI_CALL(OCIConnectionPoolCreate, (OCI_G(env), OCI_G(err), cpoolh, NULL, 0, NULL, 0, 0, 0, 0, NULL, 0, NULL, 0, cpoolmode));
+	PHP_OCI_CALL(OCIConnectionPoolDestroy, (cpoolh, OCI_G(err), OCI_DEFAULT));
+	PHP_OCI_CALL(OCIHandleFree, (cpoolh, OCI_HTYPE_CPOOL));
+#endif
+
 	return;
 
 oci_error: