1
0
mirror of https://github.com/php/php-src.git synced 2026-04-27 01:48:26 +02:00

Oracle 11.2 (and beyond) compat changes

This commit is contained in:
Christopher Jones
2009-10-02 22:39:28 +00:00
parent de0592a3a3
commit 2d64d1ff72
2 changed files with 10 additions and 10 deletions
+5 -5
View File
@@ -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)");
}
}
?>
+5 -5
View File
@@ -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)");
}
}
?>