Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3: Fix bug ext\filter\tests\bug52209.phpt fails
php · Apr 30, 2012 · 455040c · 455040c
2 parents 72ccce4 + 8249581
commit 455040c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/ext/filter/tests/bug52209.phpt b/ext/filter/tests/bug52209.phpt
@@ -1,7 +1,13 @@
 --TEST--
 Bug #52209 (INPUT_ENV returns NULL for set variables (CLI))
 --SKIPIF--
-<?php if (!extension_loaded("filter") || !empty($_ENV['PWD'])) die("skip"); ?>
+<?php
+/* This test makes no sense on windows as an empty variable 
+   would never show up in the "set" list. Which means, it's 
+   always undefined in PHP. */
+if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows");
+if (!extension_loaded("filter") || !empty($_ENV['PWD'])) die("skip");
+?>
 --INI--
 variables_order=GPCSE
 --FILE--