From: Jani Taskinen <jani@php.net>
Date: Mon, 28 Apr 2008 12:30:33 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-5.2.6~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2c9167ebb836c0957cf6e170773ab1b1350bcfb;p=php

MFH
---

diff --git a/ext/standard/tests/file/bug22414.phpt b/ext/standard/tests/file/bug22414.phpt
index b60b865e74..f5036daa8c 100644
--- a/ext/standard/tests/file/bug22414.phpt
+++ b/ext/standard/tests/file/bug22414.phpt
@@ -8,20 +8,21 @@ output_handler=
 
 	$php = getenv('TEST_PHP_EXECUTABLE');
 	$tmpfile = tempnam('/tmp', 'phpt');
+	$args = ' -n -dsafe_mode=off ';
 	
 	/* Regular Data Test */
-	passthru($php . ' -n -r " echo \"HELLO\"; "');
+	passthru($php . $args . ' -r " echo \"HELLO\"; "');
 
 	echo "\n";
 
 	/* Binary Data Test */
 	
 	if (substr(PHP_OS, 0, 3) != 'WIN') {
-		$cmd = $php . ' -n -r \"readfile(@getenv(\'TEST_PHP_EXECUTABLE\')); \"';
-		$cmd = $php . ' -n -r \' passthru("'.$cmd.'"); \' > '.$tmpfile ;
+		$cmd = $php . $args . ' -r \"readfile(@getenv(\'TEST_PHP_EXECUTABLE\')); \"';
+		$cmd = $php . $args . ' -r \' passthru("'.$cmd.'"); \' > '.$tmpfile ;
 	} else {
-		$cmd = $php . ' -n -r \"readfile(@getenv(\\\\\\"TEST_PHP_EXECUTABLE\\\\\\")); \"';
-		$cmd = $php . ' -n -r " passthru(\''.$cmd.'\');" > '.$tmpfile ;
+		$cmd = $php . $args . ' -r \"readfile(@getenv(\\\\\\"TEST_PHP_EXECUTABLE\\\\\\")); \"';
+		$cmd = $php . $args . ' -r " passthru(\''.$cmd.'\');" > '.$tmpfile ;
 	}
 	exec($cmd);