From: Christopher Jones <sixd@php.net>
Date: Fri, 2 Oct 2009 22:39:28 +0000 (+0000)
Subject: Oracle 11.2 (and beyond) compat changes
X-Git-Tag: php-5.3.2RC1~401
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d64d1ff72a224f916408fc04d31e1abcf83986e;p=php

Oracle 11.2 (and beyond) compat changes
---

diff --git a/ext/oci8/tests/password_new.phpt b/ext/oci8/tests/password_new.phpt
index e8642abca7..ba6baa964b 100644
--- a/ext/oci8/tests/password_new.phpt
+++ b/ext/oci8/tests/password_new.phpt
@@ -3,21 +3,21 @@ oci_password_change()
 --SKIPIF--
 <?php
 if (!extension_loaded('oci8')) die("skip no oci8 extension"); 
-require dirname(__FILE__)."/connect.inc";
+require(dirname(__FILE__)."/connect.inc");
 if (empty($dbase)) die ("skip requires database connection string be set");
 if ($test_drcp) die("skip password change not supported in DRCP Mode");
 
-// This test is known to fail with Oracle 10g client libraries
-// connecting to Oracle Database 11.1.0.6 (Oracle bug 6277160)
+// This test is known to fail with Oracle 10.2.0.4 client libraries
+// connecting to Oracle Database 11 (Oracle bug 6277160, fixed 10.2.0.5)
 $sv = oci_server_version($c);
-$sv = preg_match('/11.1/', $sv, $matches);
+$sv = preg_match('/Release (11|12)\./', $sv, $matches);
 if ($sv === 1) {
 	ob_start();
 	phpinfo(INFO_MODULES);
 	$phpinfo = ob_get_clean();
 	$iv = preg_match('/Oracle .*Version => 10/', $phpinfo);
 	if ($iv === 1) {
-		die ("skip test known to fail using Oracle 10gR2 client libs connecting to Oracle 11.1 (6277160)");
+		die ("skip test known to fail using Oracle 10.2.0.4 client libs connecting to Oracle 11 (6277160)");
 	}
 }
 ?>
diff --git a/ext/oci8/tests/password_old.phpt b/ext/oci8/tests/password_old.phpt
index 157bdebcaa..abcaeb1e56 100644
--- a/ext/oci8/tests/password_old.phpt
+++ b/ext/oci8/tests/password_old.phpt
@@ -3,21 +3,21 @@ ocipasswordchange()
 --SKIPIF--
 <?php
 if (!extension_loaded('oci8')) die("skip no oci8 extension"); 
-require dirname(__FILE__)."/connect.inc";
+require(dirname(__FILE__)."/connect.inc");
 if (empty($dbase)) die ("skip requires database connection string be set");
 if ($test_drcp) die("skip password change not supported in DRCP Mode");
 
-// This test is known to fail with Oracle 10g client libraries
-// connecting to Oracle Database 11.1.0.6 (Oracle bug 6277160)
+// This test is known to fail with Oracle 10.2.0.4 client libraries
+// connecting to Oracle Database 11 (Oracle bug 6277160, fixed 10.2.0.5)
 $sv = oci_server_version($c);
-$sv = preg_match('/11.1/', $sv, $matches);
+$sv = preg_match('/Release (11|12)\./', $sv, $matches);
 if ($sv === 1) {
 	ob_start();
 	phpinfo(INFO_MODULES);
 	$phpinfo = ob_get_clean();
 	$iv = preg_match('/Oracle .*Version => 10/', $phpinfo);
 	if ($iv === 1) {
-		die ("skip test known to fail using Oracle 10gR2 client libs connecting to Oracle 11.1 (6277160)");
+		die ("skip test known to fail using Oracle 10.2.0.4 client libs connecting to Oracle 11 (6277160)");
 	}
 }
 ?>