sixd Fri, 02 Oct 2009 22:39:28 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=289113
Log:
Oracle 11.2 (and beyond) compat changes
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/tests/password_new.phpt
U php/php-src/branches/PHP_5_3/ext/oci8/tests/password_old.phpt
U php/php-src/trunk/ext/oci8/tests/password_new.phpt
U php/php-src/trunk/ext/oci8/tests/password_old.phpt
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/password_new.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/password_new.phpt
2009-10-02 22:36:01 UTC (rev 289112)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/password_new.phpt
2009-10-02 22:39:28 UTC (rev 289113)
@@ -3,21 +3,21 @@
--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)");
}
}
?>
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/password_old.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/password_old.phpt
2009-10-02 22:36:01 UTC (rev 289112)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/password_old.phpt
2009-10-02 22:39:28 UTC (rev 289113)
@@ -3,21 +3,21 @@
--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)");
}
}
?>
Modified: php/php-src/trunk/ext/oci8/tests/password_new.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/password_new.phpt 2009-10-02 22:36:01 UTC
(rev 289112)
+++ php/php-src/trunk/ext/oci8/tests/password_new.phpt 2009-10-02 22:39:28 UTC
(rev 289113)
@@ -3,21 +3,21 @@
--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)");
}
}
?>
Modified: php/php-src/trunk/ext/oci8/tests/password_old.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/password_old.phpt 2009-10-02 22:36:01 UTC
(rev 289112)
+++ php/php-src/trunk/ext/oci8/tests/password_old.phpt 2009-10-02 22:39:28 UTC
(rev 289113)
@@ -3,21 +3,21 @@
--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)");
}
}
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
