MFH (not with cli)

1 files changed, 12 insertions, 11 deletions

diff --git a/tests/basic/011.phpt b/tests/basic/011.phpt
index 9320c16c16..f3e8e35902 100644
--- a/tests/basic/011.phpt
+++ b/tests/basic/011.phpt
@@ -1,21 +1,22 @@
 --TEST--
-Testing $argc and $argv handling
+Testing $argc and $argv handling (GET)
 --SKIPIF--
-<?php if(ini_get('register_argc_argv') == '') echo 'skip'; ?>
+<?php if (ini_get('register_argc_argv')=='' || php_sapi_name()=='cli') echo 'skip'; ?>
 --POST--
 --GET--
 ab+cd+ef+123+test
 --FILE--
 <?php 
-	if(ini_get('register_globals') != '') {
-		for($i=0;$i<$argc;$i++) {
-			echo "$i: ".$argv[$i]."\n";
-		}
-	} else {
-		for($i=0;$i<$_SERVER['argc'];$i++) {
-			echo "$i: ".$_SERVER['argv'][$i]."\n";
-		}
-	}
+
+if (!ini_get('register_globals')) {
+	$argc = $_SERVER['argc'];
+	$argv = $_SERVER['argv'];
+}
+
+for ($i=0; $i<$argc; $i++) {
+	echo "$i: ".$argv[$i]."\n";
+}
+
 ?>
 --EXPECT--
 0: ab