--- embedaddon/php/ext/oci8/tests/null_byte_1.phpt	2012/02/21 23:47:58	1.1.1.1
+++ embedaddon/php/ext/oci8/tests/null_byte_1.phpt	2012/05/29 12:34:41	1.1.1.2
@@ -1,13 +1,21 @@
 --TEST--
-Protect against null bytes in LOB filenames (http://news.php.net/php.internals/50202)
+Protect against null bytes in LOB filenames
 --SKIPIF--
-<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
+<?php
+if (!extension_loaded('oci8'))
+    die ("skip no oci8 extension");
+if (PHP_MAJOR_VERSION < 5 || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4))
+    die ("skip Test only valid for PHP 5.4 onwards");
+?>
 --INI--
 display_errors = On
 error_reporting = E_WARNING
 --FILE--
 <?php
 
+// See http://news.php.net/php.internals/50202
+//     http://svn.php.net/viewvc?view=revision&revision=311870
+
 require(dirname(__FILE__).'/connect.inc');
 
 // Run Test
@@ -29,10 +37,10 @@ var_dump($r);
 --EXPECTF--
 Test 1: Import
 
-Warning: OCI-Lob::savefile(): Filename cannot contain null bytes in %snull_byte_1.php on line %d
-bool(false)
+Warning: OCI-Lob::savefile() expects parameter 1 to be a valid path, string given in %snull_byte_1.php on line %d
+NULL
 Test 2: Export
 
-Warning: OCI-Lob::export(): Filename cannot contain null bytes in %snull_byte_1.php on line %d
-bool(false)
+Warning: OCI-Lob::export() expects parameter 1 to be a valid path, string given in %snull_byte_1.php on line %d
+NULL
 ===DONE===